diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-05-15 13:43:30 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-05-15 13:43:30 +0000 |
commit | d8c7285b2aef85c9998c6558429a9f4e27066748 (patch) | |
tree | 0025d3827121642551be3c69eac7c4d2262dcb2a /firmware/target/arm | |
parent | 3eb6da3c1d4d1dfd4bfbf7eeff6d0d8361565344 (diff) | |
download | rockbox-d8c7285b2aef85c9998c6558429a9f4e27066748.tar.gz rockbox-d8c7285b2aef85c9998c6558429a9f4e27066748.zip |
M:Robe 500: Commit some minor changes and some keymap changes (short press power takes you out of the WPS)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20942 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
4 files changed, 5 insertions, 66 deletions
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c index 2377309a1d..51837dd653 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c | |||
@@ -68,67 +68,3 @@ void ata_device_init(void) | |||
68 | IO_GIO_DIR0&=~(1<<10); | 68 | IO_GIO_DIR0&=~(1<<10); |
69 | } | 69 | } |
70 | 70 | ||
71 | #if 0 | ||
72 | void copy_read_sectors(unsigned char* buf, int wordcount) | ||
73 | { | ||
74 | __buttonlight_trigger(); | ||
75 | |||
76 | /* Unaligned transfer - slow copy */ | ||
77 | if ( (unsigned long)buf & 1) | ||
78 | { /* not 16-bit aligned, copy byte by byte */ | ||
79 | unsigned short tmp = 0; | ||
80 | unsigned char* bufend = buf + wordcount*2; | ||
81 | do | ||
82 | { | ||
83 | tmp = ATA_DATA; | ||
84 | *buf++ = tmp & 0xff; /* I assume big endian */ | ||
85 | *buf++ = tmp >> 8; /* and don't use the SWAB16 macro */ | ||
86 | } while (buf < bufend); /* tail loop is faster */ | ||
87 | return; | ||
88 | } | ||
89 | /* This should never happen, but worth watching for */ | ||
90 | if(wordcount > (1 << 18)) | ||
91 | panicf("atd-meg-fx.c: copy_read_sectors: too many sectors per read!"); | ||
92 | |||
93 | //#define GIGABEAT_DEBUG_ATA | ||
94 | #ifdef GIGABEAT_DEBUG_ATA | ||
95 | static int line = 0; | ||
96 | static char str[256]; | ||
97 | snprintf(str, sizeof(str), "ODD DMA to %08x, %d", buf, wordcount); | ||
98 | lcd_puts(10, line, str); | ||
99 | line = (line+1) % 32; | ||
100 | lcd_update(); | ||
101 | #endif | ||
102 | /* Reset the channel */ | ||
103 | DMASKTRIG0 |= 4; | ||
104 | /* Wait for DMA controller to be ready */ | ||
105 | while(DMASKTRIG0 & 0x2) | ||
106 | ; | ||
107 | while(DSTAT0 & (1 << 20)) | ||
108 | ; | ||
109 | /* Source is ATA_DATA, on AHB Bus, Fixed */ | ||
110 | DISRC0 = (int) 0x18000000; | ||
111 | DISRCC0 = 0x1; | ||
112 | /* Dest mapped to physical address, on AHB bus, increment */ | ||
113 | DIDST0 = (int) buf; | ||
114 | if(DIDST0 < 0x30000000) | ||
115 | DIDST0 += 0x30000000; | ||
116 | DIDSTC0 = 0; | ||
117 | |||
118 | /* DACK/DREQ Sync to AHB, Whole service, No reload, 16-bit transfers */ | ||
119 | DCON0 = ((1 << 30) | (1<<27) | (1<<22) | (1<<20)) | wordcount; | ||
120 | |||
121 | /* Activate the channel */ | ||
122 | DMASKTRIG0 = 0x2; | ||
123 | |||
124 | invalidate_dcache_range((void *)buf, wordcount*2); | ||
125 | |||
126 | /* Start DMA */ | ||
127 | DMASKTRIG0 |= 0x1; | ||
128 | |||
129 | /* Wait for transfer to complete */ | ||
130 | while((DSTAT0 & 0x000fffff)) | ||
131 | priority_yield(); | ||
132 | /* Dump cache for the buffer */ | ||
133 | } | ||
134 | #endif | ||
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c index 3e7077bd6d..4def88c4f8 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c | |||
@@ -130,9 +130,11 @@ int button_read_device(int *data) | |||
130 | button_read |= BUTTON_POWER; | 130 | button_read |= BUTTON_POWER; |
131 | } | 131 | } |
132 | 132 | ||
133 | #if defined(HAVE_REMOTE_LCD) | ||
133 | /* Read data from the remote */ | 134 | /* Read data from the remote */ |
134 | button_read |= remote_read_device(); | 135 | button_read |= remote_read_device(); |
135 | hold_button=remote_button_hold(); | 136 | hold_button=remote_button_hold(); |
137 | #endif | ||
136 | 138 | ||
137 | /* Take care of hold notifications */ | 139 | /* Take care of hold notifications */ |
138 | #ifndef BOOTLOADER | 140 | #ifndef BOOTLOADER |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c index 1b90ccca78..c0d497ccdc 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c | |||
@@ -73,7 +73,9 @@ void power_off(void) | |||
73 | { | 73 | { |
74 | /* turn off backlight and wait for 1 second */ | 74 | /* turn off backlight and wait for 1 second */ |
75 | _backlight_off(); | 75 | _backlight_off(); |
76 | #if defined(HAVE_REMOTE_LCD) | ||
76 | lcd_remote_sleep(); | 77 | lcd_remote_sleep(); |
78 | #endif | ||
77 | lcd_sleep(); | 79 | lcd_sleep(); |
78 | sleep(HZ); | 80 | sleep(HZ); |
79 | /* Hard shutdown */ | 81 | /* Hard shutdown */ |
diff --git a/firmware/target/arm/tms320dm320/system-dm320.c b/firmware/target/arm/tms320dm320/system-dm320.c index 0142f7b18b..b8c9eee87f 100644 --- a/firmware/target/arm/tms320dm320/system-dm320.c +++ b/firmware/target/arm/tms320dm320/system-dm320.c | |||
@@ -246,8 +246,7 @@ void system_init(void) | |||
246 | 246 | ||
247 | IO_INTC_ENTRY_TBA0 = 0; | 247 | IO_INTC_ENTRY_TBA0 = 0; |
248 | IO_INTC_ENTRY_TBA1 = 0; | 248 | IO_INTC_ENTRY_TBA1 = 0; |
249 | 249 | ||
250 | |||
251 | int i; | 250 | int i; |
252 | /* Set interrupt priorities to predefined values */ | 251 | /* Set interrupt priorities to predefined values */ |
253 | for(i = 0; i < 23; i++) | 252 | for(i = 0; i < 23; i++) |