diff options
-rw-r--r-- | firmware/drivers/lcd-recorder.c | 20 | ||||
-rw-r--r-- | firmware/drivers/lcd.c | 16 | ||||
-rw-r--r-- | firmware/system.c | 34 |
3 files changed, 35 insertions, 35 deletions
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c index fae4ea2945..26112e37dd 100644 --- a/firmware/drivers/lcd-recorder.c +++ b/firmware/drivers/lcd-recorder.c | |||
@@ -57,16 +57,16 @@ | |||
57 | #define LCD_SET_END_OF_READ_MODIFY_WRITE_MODE ((char)0xEE) | 57 | #define LCD_SET_END_OF_READ_MODIFY_WRITE_MODE ((char)0xEE) |
58 | 58 | ||
59 | /* LCD command codes */ | 59 | /* LCD command codes */ |
60 | #define LCD_CNTL_RESET 0xe2 // Software reset | 60 | #define LCD_CNTL_RESET 0xe2 /* Software reset */ |
61 | #define LCD_CNTL_POWER 0x2f // Power control | 61 | #define LCD_CNTL_POWER 0x2f /* Power control */ |
62 | #define LCD_CNTL_CONTRAST 0x81 // Contrast | 62 | #define LCD_CNTL_CONTRAST 0x81 /* Contrast */ |
63 | #define LCD_CNTL_OUTSCAN 0xc8 // Output scan direction | 63 | #define LCD_CNTL_OUTSCAN 0xc8 /* Output scan direction */ |
64 | #define LCD_CNTL_SEGREMAP 0xa1 // Segment remap | 64 | #define LCD_CNTL_SEGREMAP 0xa1 /* Segment remap */ |
65 | #define LCD_CNTL_DISPON 0xaf // Display on | 65 | #define LCD_CNTL_DISPON 0xaf /* Display on */ |
66 | 66 | ||
67 | #define LCD_CNTL_PAGE 0xb0 // Page address | 67 | #define LCD_CNTL_PAGE 0xb0 /* Page address */ |
68 | #define LCD_CNTL_HIGHCOL 0x10 // Upper column address | 68 | #define LCD_CNTL_HIGHCOL 0x10 /* Upper column address */ |
69 | #define LCD_CNTL_LOWCOL 0x00 // Lower column address | 69 | #define LCD_CNTL_LOWCOL 0x00 /* Lower column address */ |
70 | 70 | ||
71 | #define SCROLL_SPACING 3 | 71 | #define SCROLL_SPACING 3 |
72 | 72 | ||
diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index 38dbe3cc2c..3f6acee301 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c | |||
@@ -23,15 +23,15 @@ | |||
23 | #define LCDR (PBDR_ADDR+1) | 23 | #define LCDR (PBDR_ADDR+1) |
24 | 24 | ||
25 | #ifdef HAVE_LCD_CHARCELLS | 25 | #ifdef HAVE_LCD_CHARCELLS |
26 | #define LCD_DS 1 // PB0 = 1 --- 0001 --- LCD-DS | 26 | #define LCD_DS 1 /* PB0 = 1 --- 0001 --- LCD-DS */ |
27 | #define LCD_CS 2 // PB1 = 1 --- 0010 --- /LCD-CS | 27 | #define LCD_CS 2 /* PB1 = 1 --- 0010 --- /LCD-CS */ |
28 | #define LCD_SD 4 // PB2 = 1 --- 0100 --- LCD-SD | 28 | #define LCD_SD 4 /* PB2 = 1 --- 0100 --- LCD-SD */ |
29 | #define LCD_SC 8 // PB3 = 1 --- 1000 --- LCD-SC | 29 | #define LCD_SC 8 /* PB3 = 1 --- 1000 --- LCD-SC */ |
30 | #else | 30 | #else |
31 | #define LCD_SD 1 // PB0 = 1 --- 0001 | 31 | #define LCD_SD 1 /* PB0 = 1 --- 0001 */ |
32 | #define LCD_SC 2 // PB1 = 1 --- 0010 | 32 | #define LCD_SC 2 /* PB1 = 1 --- 0010 */ |
33 | #define LCD_RS 4 // PB2 = 1 --- 0100 | 33 | #define LCD_RS 4 /* PB2 = 1 --- 0100 */ |
34 | #define LCD_CS 8 // PB3 = 1 --- 1000 | 34 | #define LCD_CS 8 /* PB3 = 1 --- 1000 */ |
35 | #define LCD_DS LCD_RS | 35 | #define LCD_DS LCD_RS |
36 | #endif | 36 | #endif |
37 | 37 | ||
diff --git a/firmware/system.c b/firmware/system.c index 97c981e0c2..3f75e020c1 100644 --- a/firmware/system.c +++ b/firmware/system.c | |||
@@ -66,22 +66,22 @@ default_interrupt (UB, 12); | |||
66 | reserve_interrupt ( 13); | 66 | reserve_interrupt ( 13); |
67 | reserve_interrupt ( 14); | 67 | reserve_interrupt ( 14); |
68 | reserve_interrupt ( 15); | 68 | reserve_interrupt ( 15); |
69 | reserve_interrupt ( 16); // TCB #0 | 69 | reserve_interrupt ( 16); /* TCB #0 */ |
70 | reserve_interrupt ( 17); // TCB #1 | 70 | reserve_interrupt ( 17); /* TCB #1 */ |
71 | reserve_interrupt ( 18); // TCB #2 | 71 | reserve_interrupt ( 18); /* TCB #2 */ |
72 | reserve_interrupt ( 19); // TCB #3 | 72 | reserve_interrupt ( 19); /* TCB #3 */ |
73 | reserve_interrupt ( 20); // TCB #4 | 73 | reserve_interrupt ( 20); /* TCB #4 */ |
74 | reserve_interrupt ( 21); // TCB #5 | 74 | reserve_interrupt ( 21); /* TCB #5 */ |
75 | reserve_interrupt ( 22); // TCB #6 | 75 | reserve_interrupt ( 22); /* TCB #6 */ |
76 | reserve_interrupt ( 23); // TCB #7 | 76 | reserve_interrupt ( 23); /* TCB #7 */ |
77 | reserve_interrupt ( 24); // TCB #8 | 77 | reserve_interrupt ( 24); /* TCB #8 */ |
78 | reserve_interrupt ( 25); // TCB #9 | 78 | reserve_interrupt ( 25); /* TCB #9 */ |
79 | reserve_interrupt ( 26); // TCB #10 | 79 | reserve_interrupt ( 26); /* TCB #10 */ |
80 | reserve_interrupt ( 27); // TCB #11 | 80 | reserve_interrupt ( 27); /* TCB #11 */ |
81 | reserve_interrupt ( 28); // TCB #12 | 81 | reserve_interrupt ( 28); /* TCB #12 */ |
82 | reserve_interrupt ( 29); // TCB #13 | 82 | reserve_interrupt ( 29); /* TCB #13 */ |
83 | reserve_interrupt ( 30); // TCB #14 | 83 | reserve_interrupt ( 30); /* TCB #14 */ |
84 | reserve_interrupt ( 31); // TCB #15 | 84 | reserve_interrupt ( 31); /* TCB #15 */ |
85 | default_interrupt (TRAPA32, 32); | 85 | default_interrupt (TRAPA32, 32); |
86 | default_interrupt (TRAPA33, 33); | 86 | default_interrupt (TRAPA33, 33); |
87 | default_interrupt (TRAPA34, 34); | 87 | default_interrupt (TRAPA34, 34); |
@@ -330,7 +330,7 @@ void UIE (unsigned int pc) /* Unexpected Interrupt or Exception */ | |||
330 | lcd_setfont(FONT_SYSFIXED); | 330 | lcd_setfont(FONT_SYSFIXED); |
331 | #endif | 331 | #endif |
332 | /* output exception */ | 332 | /* output exception */ |
333 | n = (n - (unsigned)UIE0 - 4)>>2; // get exception or interrupt number | 333 | n = (n - (unsigned)UIE0 - 4)>>2; /* get exception or interrupt number */ |
334 | snprintf(str,sizeof(str),"I%02x:%s",n,irqname[n]); | 334 | snprintf(str,sizeof(str),"I%02x:%s",n,irqname[n]); |
335 | lcd_puts(0,0,str); | 335 | lcd_puts(0,0,str); |
336 | snprintf(str,sizeof(str),"at %08x",pc); | 336 | snprintf(str,sizeof(str),"at %08x",pc); |