diff options
Diffstat (limited to 'firmware/target/coldfire/iriver/h100')
-rw-r--r-- | firmware/target/coldfire/iriver/h100/adc-h100.c | 4 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h100/lcd-as-h100.S | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/firmware/target/coldfire/iriver/h100/adc-h100.c b/firmware/target/coldfire/iriver/h100/adc-h100.c index b69204aa02..0c14d7b338 100644 --- a/firmware/target/coldfire/iriver/h100/adc-h100.c +++ b/firmware/target/coldfire/iriver/h100/adc-h100.c | |||
@@ -37,7 +37,7 @@ | |||
37 | ({ \ | 37 | ({ \ |
38 | int _x_; \ | 38 | int _x_; \ |
39 | asm volatile ( \ | 39 | asm volatile ( \ |
40 | "move.l #11, %[_x_] \r\n" \ | 40 | "move.l #13, %[_x_] \r\n" \ |
41 | "1: \r\n" \ | 41 | "1: \r\n" \ |
42 | "subq.l #1, %[_x_] \r\n" \ | 42 | "subq.l #1, %[_x_] \r\n" \ |
43 | "bhi.b 1b \r\n" \ | 43 | "bhi.b 1b \r\n" \ |
@@ -94,7 +94,7 @@ unsigned short adc_scan(int channel) | |||
94 | data <<= 1; | 94 | data <<= 1; |
95 | data |= DO?1:0; | 95 | data |= DO?1:0; |
96 | } | 96 | } |
97 | 97 | ||
98 | CS_HI; | 98 | CS_HI; |
99 | 99 | ||
100 | set_irq_level(level); | 100 | set_irq_level(level); |
diff --git a/firmware/target/coldfire/iriver/h100/lcd-as-h100.S b/firmware/target/coldfire/iriver/h100/lcd-as-h100.S index 1605b210c1..c7509871fc 100644 --- a/firmware/target/coldfire/iriver/h100/lcd-as-h100.S +++ b/firmware/target/coldfire/iriver/h100/lcd-as-h100.S | |||
@@ -29,8 +29,8 @@ | |||
29 | 29 | ||
30 | lcd_write_command: | 30 | lcd_write_command: |
31 | move.l (4,%sp),%d0 | 31 | move.l (4,%sp),%d0 |
32 | lea MBAR2,%a1 | 32 | lea MBAR2,%a1 |
33 | move.l #~8,%d1 | 33 | move.l #~8,%d1 |
34 | and.l %d1,(0xb4,%a1) | 34 | and.l %d1,(0xb4,%a1) |
35 | move.w %d0,0xf0000000 | 35 | move.w %d0,0xf0000000 |
36 | rts | 36 | rts |
@@ -77,19 +77,19 @@ lcd_write_command_ex: | |||
77 | lcd_write_data: | 77 | lcd_write_data: |
78 | move.l (4,%sp),%a0 /* Data pointer */ | 78 | move.l (4,%sp),%a0 /* Data pointer */ |
79 | move.l (8,%sp),%d0 /* Length */ | 79 | move.l (8,%sp),%d0 /* Length */ |
80 | lea MBAR2,%a1 | 80 | lea MBAR2,%a1 |
81 | moveq #8,%d1 | 81 | moveq #8,%d1 |
82 | or.l %d1,(0xb4,%a1) | 82 | or.l %d1,(0xb4,%a1) |
83 | 83 | ||
84 | lea 0xf0000000,%a1 | 84 | lea 0xf0000000,%a1 |
85 | .loop: | 85 | .loop: |
86 | /* When running in IRAM, this loop takes 7 cycles plus the LCD write. | 86 | /* When running in IRAM, this loop takes 10 cycles plus the LCD write. |
87 | The 7 cycles are necessary to follow the LCD timing specs | 87 | The 10 cycles are necessary to follow the LCD timing specs |
88 | at 140MHz */ | 88 | at 140MHz */ |
89 | nop /* 3(0/0) */ | ||
89 | move.b (%a0)+,%d1 /* 3(1/0) */ | 90 | move.b (%a0)+,%d1 /* 3(1/0) */ |
90 | move.w %d1,(%a1) /* 1(0/1) */ | 91 | move.w %d1,(%a1) /* 1(0/1) */ |
91 | subq.l #1,%d0 /* 1(0/0) */ | 92 | subq.l #1,%d0 /* 1(0/0) */ |
92 | nop /* 1(0/0) */ | ||
93 | bne .loop /* 2(0/0) */ | 93 | bne .loop /* 2(0/0) */ |
94 | rts | 94 | rts |
95 | .wd_end: | 95 | .wd_end: |