diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-02-05 21:47:54 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-02-05 21:47:54 +0000 |
commit | ee1e8be37f38dde1e7a34935140f95f13b60685d (patch) | |
tree | b3e7bb0759d4cabb2507d9656d5d653066b9c10f /firmware/target/arm/tms320dm320/creative-zvm | |
parent | e1aee318782d89e017e1241847706b21ea014974 (diff) | |
download | rockbox-ee1e8be37f38dde1e7a34935140f95f13b60685d.tar.gz rockbox-ee1e8be37f38dde1e7a34935140f95f13b60685d.zip |
Creative ZVM:
* Re-enable USB
* Acknowledge EP0SETUP packets
* Spin disk down when no files get loaded in the bootloader
* Clean up/fix some other stuff
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19931 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/tms320dm320/creative-zvm')
5 files changed, 130 insertions, 89 deletions
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c index a55cda4c14..b945d47b4b 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c | |||
@@ -203,7 +203,7 @@ static unsigned long cfs_start; | |||
203 | static unsigned long *sectors; | 203 | static unsigned long *sectors; |
204 | 204 | ||
205 | #define CFS_START ( ((hdr->partitions[1].start*hdr->sector_size) & ~0xFFFF) + 0x10000 ) | 205 | #define CFS_START ( ((hdr->partitions[1].start*hdr->sector_size) & ~0xFFFF) + 0x10000 ) |
206 | #define CFS_CLUSTER2CLUSTER(x) ( CFS_START+((x)-1)*64 ) | 206 | #define CFS_CLUSTER2CLUSTER(x) ( (CFS_START/512)+((x)-1)*64 ) |
207 | 207 | ||
208 | /* Limited version of UCS -> ASCII */ | 208 | /* Limited version of UCS -> ASCII */ |
209 | static char* ucs2letostring(unsigned char* s) | 209 | static char* ucs2letostring(unsigned char* s) |
@@ -211,7 +211,7 @@ static char* ucs2letostring(unsigned char* s) | |||
211 | static char res[256]; | 211 | static char res[256]; |
212 | int i; | 212 | int i; |
213 | 213 | ||
214 | for(i=0; (s[i] == 0 && s[i+1] == 0); i++) | 214 | for(i=0; (s[i] == 0 && s[i+1] == 0 && i<256); i++) |
215 | res[i] = s[i*2]; | 215 | res[i] = s[i*2]; |
216 | 216 | ||
217 | return (char*)&res; | 217 | return (char*)&res; |
@@ -236,111 +236,134 @@ static void cfs_init(void) | |||
236 | _ata_read_sectors(0, 1, §or); | 236 | _ata_read_sectors(0, 1, §or); |
237 | hdr = (struct main_header*)§or; | 237 | hdr = (struct main_header*)§or; |
238 | 238 | ||
239 | //printf("CFS is at 0x%x", CFS_START); | 239 | logf("CFS is at 0x%x [0x%x]", CFS_START, CFS_START/512); |
240 | 240 | ||
241 | /* Read CFS header */ | 241 | /* Read CFS header */ |
242 | _ata_read_sectors(CFS_START/512, 64, §or2); | 242 | _ata_read_sectors(CFS_START/512, 64, §or2); |
243 | cfs = (struct cfs_header*)§or2; | 243 | cfs = (struct cfs_header*)§or2; |
244 | 244 | ||
245 | //printf("First inode = %d", cfs->first_inode); | 245 | logf("First inode = 0x%x", cfs->first_inode); |
246 | 246 | ||
247 | /* Read root inode */ | 247 | /* Read root inode */ |
248 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(cfs->first_inode), 64, §or2); | 248 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(cfs->first_inode), 64, §or2); |
249 | root_inode = (struct cfs_inode*)§or2; | 249 | root_inode = (struct cfs_inode*)§or2; |
250 | |||
251 | logf("Root inode = 0x%x", root_inode); | ||
252 | |||
253 | logf("0x%x 0x%x", CFS_CLUSTER2CLUSTER(root_inode->first_class_chain[0]), root_inode->first_class_chain[0]); | ||
250 | 254 | ||
251 | /* Read root inode's first sector */ | 255 | /* Read root inode's first sector */ |
252 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(root_inode->first_class_chain[0]), 64, §or2); | 256 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(root_inode->first_class_chain[0]), 64, §or2); |
253 | root_direntry = (struct cfs_direntry*)§or2; | 257 | root_direntry = (struct cfs_direntry*)§or2; |
254 | root_direntry_items = (struct cfs_direntry_item*)(§or2+sizeof(struct cfs_direntry)); | 258 | root_direntry_items = (struct cfs_direntry_item*)(§or2+sizeof(struct cfs_direntry)); |
255 | 259 | ||
260 | logf("0x%x", root_direntry->identifier); | ||
261 | |||
262 | logf("%d", root_direntry->items); | ||
263 | |||
256 | /* Search VFAT inode */ | 264 | /* Search VFAT inode */ |
257 | for(i=0; i < root_direntry->items; i++) | 265 | for(i=0; i < root_direntry->items; i++) |
258 | { | 266 | { |
259 | //printf(" * [%s] at 0x%x\n", ucs2letostring(&root_direntry_items[i].string[0]), root_direntry_items[i].inode_number); | 267 | if(root_direntry_items[i].inode_number != 0) |
260 | if(strcmp(ucs2letostring(&root_direntry_items[i].string[0]), "VFAT") == 0) | 268 | { |
261 | vfat_inode_nr = root_direntry_items[i].inode_number; | 269 | //logf(" * [%s] at 0x%x", ucs2letostring(&root_direntry_items[i].string[0]), root_direntry_items[i].inode_number); |
270 | if(strcmp(ucs2letostring(&root_direntry_items[i].string[0]), "VFAT") == 0) | ||
271 | vfat_inode_nr = root_direntry_items[i].inode_number; | ||
272 | } | ||
262 | } | 273 | } |
263 | 274 | ||
264 | /* Read VFAT inode */ | 275 | logf("VFAT inode = 0x%x", vfat_inode_nr); |
265 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_inode_nr), 64, §or2); | 276 | |
266 | vfat_inode = (struct cfs_inode*)§or2; | 277 | if(vfat_inode_nr != 0) |
267 | |||
268 | /* Read VFAT inode's first sector */ | ||
269 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_inode->first_class_chain[0]), 64, §or2); | ||
270 | vfat_direntry = (struct cfs_direntry*)§or2; | ||
271 | vfat_direntry_items = (struct cfs_direntry_item*)(§or2+sizeof(struct cfs_direntry)); | ||
272 | |||
273 | /* Search for VFAT's subinodes */ | ||
274 | for(i=0; i < vfat_direntry->items; i++) | ||
275 | { | 278 | { |
276 | //printf(" * [%s] at 0x%x\n", ucs2letostring(&vfat_direntry_items[i].string[0]), vfat_direntry_items[i].inode_number); | 279 | /* Read VFAT inode */ |
277 | if(i > 0) | 280 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_inode_nr), 64, §or2); |
278 | vfat_inodes_nr[i-1] = vfat_direntry_items[i].inode_number; | 281 | vfat_inode = (struct cfs_inode*)§or2; |
279 | } | ||
280 | 282 | ||
281 | /* Determine size of VFAT file */ | 283 | /* Read VFAT inode's first sector */ |
282 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_inodes_nr[1]), 1, §or); | 284 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_inode->first_class_chain[0]), 64, §or2); |
283 | inode = (struct cfs_inode*)§or; | 285 | vfat_direntry = (struct cfs_direntry*)§or2; |
284 | sectors = (unsigned long*)buffer_alloc(VFAT_SECTOR_SIZE(inode->filesize)); | 286 | vfat_direntry_items = (struct cfs_direntry_item*)(§or2+sizeof(struct cfs_direntry)); |
285 | 287 | ||
286 | //printf("VFAT file size: 0x%x", inode->filesize); | 288 | /* Search for VFAT's subinodes */ |
287 | 289 | for(i=0; i < vfat_direntry->items; i++) | |
288 | /* Clear data sectors */ | 290 | { |
289 | memset(§ors, 0, VFAT_SECTOR_SIZE(inode->filesize)*sizeof(unsigned long)); | 291 | logf(" * [%s] at 0x%x\n", ucs2letostring(&vfat_direntry_items[i].string[0]), vfat_direntry_items[i].inode_number); |
292 | if(i > 0) | ||
293 | vfat_inodes_nr[i-1] = vfat_direntry_items[i].inode_number; | ||
294 | } | ||
290 | 295 | ||
291 | /* Read all data sectors' addresses in memory */ | 296 | /* Determine size of VFAT file */ |
292 | vfat_sector_count = 0; | 297 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_inodes_nr[1]), 1, §or); |
293 | for(i=0; vfat_inodes_nr[i] != 0; i++) | ||
294 | { | ||
295 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_inodes_nr[i]), 1, §or); | ||
296 | inode = (struct cfs_inode*)§or; | 298 | inode = (struct cfs_inode*)§or; |
299 | #ifndef BOOTLOADER | ||
300 | sectors = (unsigned long*)buffer_alloc(VFAT_SECTOR_SIZE(inode->filesize)); | ||
301 | #else | ||
302 | static unsigned long _sector[VFAT_SECTOR_SIZE(1024*1024*1024)]; /* 1GB guess */ | ||
303 | sectors = _sector; | ||
304 | #endif | ||
297 | 305 | ||
298 | /* Read second & third class chain */ | 306 | logf("VFAT file size: 0x%x", inode->filesize); |
299 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(inode->second_class_chain_first_cluster), 64, &vfat_data[0]); | ||
300 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(inode->second_class_chain_second_cluster), 64, &vfat_data[1]); | ||
301 | 307 | ||
302 | /* First class chain */ | 308 | /* Clear data sectors */ |
303 | for(j=0; j<12; j++) | 309 | memset(§ors, 0, VFAT_SECTOR_SIZE(inode->filesize)*sizeof(unsigned long)); |
304 | { | ||
305 | if( (inode->first_class_chain[j] & 0xFFFF) != 0xFFFF && | ||
306 | inode->first_class_chain[j] != 0 | ||
307 | ) | ||
308 | sectors[vfat_sector_count++] = inode->first_class_chain[j]; | ||
309 | } | ||
310 | 310 | ||
311 | /* Second class chain */ | 311 | /* Read all data sectors' addresses in memory */ |
312 | for(j=0; j<0x8000/4; j++) | 312 | vfat_sector_count = 0; |
313 | for(i=0; vfat_inodes_nr[i] != 0; i++) | ||
313 | { | 314 | { |
314 | if( (vfat_data[0][j] & 0xFFFF) != 0xFFFF && | 315 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_inodes_nr[i]), 1, §or); |
315 | vfat_data[0][j] != 0 | 316 | inode = (struct cfs_inode*)§or; |
316 | ) | ||
317 | sectors[vfat_sector_count++] = vfat_data[0][j]; | ||
318 | } | ||
319 | 317 | ||
320 | /* Third class chain */ | 318 | /* Read second & third class chain */ |
321 | for(j=0; j<0x8000/4; j++) | 319 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(inode->second_class_chain_first_cluster), 64, &vfat_data[0]); |
322 | { | 320 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(inode->second_class_chain_second_cluster), 64, &vfat_data[1]); |
323 | if( (vfat_data[1][j] & 0xFFFF) != 0xFFFF && | 321 | |
324 | vfat_data[1][j] != 0 | 322 | /* First class chain */ |
325 | ) | 323 | for(j=0; j<12; j++) |
326 | { | 324 | { |
327 | memset(&vfat_data[0], 0, 0x8000*sizeof(unsigned int)); | 325 | if( (inode->first_class_chain[j] & 0xFFFF) != 0xFFFF && |
326 | inode->first_class_chain[j] != 0 | ||
327 | ) | ||
328 | sectors[vfat_sector_count++] = inode->first_class_chain[j]; | ||
329 | } | ||
328 | 330 | ||
329 | /* Read third class subchain(s) */ | 331 | /* Second class chain */ |
330 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_data[1][j]), 64, &vfat_data[0]); | 332 | for(j=0; j<0x8000/4; j++) |
333 | { | ||
334 | if( (vfat_data[0][j] & 0xFFFF) != 0xFFFF && | ||
335 | vfat_data[0][j] != 0 | ||
336 | ) | ||
337 | sectors[vfat_sector_count++] = vfat_data[0][j]; | ||
338 | } | ||
331 | 339 | ||
332 | for(k=0; k<0x8000/4; k++) | 340 | /* Third class chain */ |
341 | for(j=0; j<0x8000/4; j++) | ||
342 | { | ||
343 | if( (vfat_data[1][j] & 0xFFFF) != 0xFFFF && | ||
344 | vfat_data[1][j] != 0 | ||
345 | ) | ||
333 | { | 346 | { |
334 | if( (vfat_data[0][k] & 0xFFFF) != 0xFFFF && | 347 | memset(&vfat_data[0], 0, 0x8000*sizeof(unsigned int)); |
335 | vfat_data[0][k] != 0 | 348 | |
336 | ) | 349 | /* Read third class subchain(s) */ |
337 | sectors[vfat_sector_count++] = vfat_data[0][k]; | 350 | _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_data[1][j]), 64, &vfat_data[0]); |
351 | |||
352 | for(k=0; k<0x8000/4; k++) | ||
353 | { | ||
354 | if( (vfat_data[0][k] & 0xFFFF) != 0xFFFF && | ||
355 | vfat_data[0][k] != 0 | ||
356 | ) | ||
357 | sectors[vfat_sector_count++] = vfat_data[0][k]; | ||
358 | } | ||
338 | } | 359 | } |
339 | } | 360 | } |
340 | } | 361 | } |
341 | } | ||
342 | 362 | ||
343 | //printf("Sector count: %d 0x%x", vfat_sector_count, vfat_sector_count); | 363 | logf("Sector count: %d 0x%x", vfat_sector_count, vfat_sector_count); |
364 | } | ||
365 | else | ||
366 | logf("Cannot find virtual FAT filesystem!"); //TODO: panicf | ||
344 | 367 | ||
345 | cfs_inited = true; | 368 | cfs_inited = true; |
346 | } | 369 | } |
@@ -386,6 +409,7 @@ int ata_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const v | |||
386 | if(!cfs_inited) | 409 | if(!cfs_inited) |
387 | cfs_init(); | 410 | cfs_init(); |
388 | 411 | ||
412 | #if 0 /* Disabled for now */ | ||
389 | /* Check if count is lesser than or equal to 1 native CFS sector */ | 413 | /* Check if count is lesser than or equal to 1 native CFS sector */ |
390 | if(count <= 64) | 414 | if(count <= 64) |
391 | return _ata_write_sectors(IF_MV2(drive,) map_sector(start), count, buf); | 415 | return _ata_write_sectors(IF_MV2(drive,) map_sector(start), count, buf); |
@@ -406,8 +430,16 @@ int ata_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const v | |||
406 | 430 | ||
407 | return ret; | 431 | return ret; |
408 | } | 432 | } |
433 | #else | ||
434 | (void)start; | ||
435 | (void)count; | ||
436 | (void)buf; | ||
437 | return 0; | ||
438 | #endif | ||
409 | } | 439 | } |
410 | 440 | ||
441 | #ifdef BOOTLOADER | ||
442 | |||
411 | /* | 443 | /* |
412 | --------------------------------------------------------------------------- | 444 | --------------------------------------------------------------------------- |
413 | MiniFileSystem parsing code | 445 | MiniFileSystem parsing code |
@@ -487,3 +519,5 @@ int load_minifs_file(char* filename, unsigned char* location) | |||
487 | 519 | ||
488 | return files[found].size; | 520 | return files[found].size; |
489 | } | 521 | } |
522 | |||
523 | #endif | ||
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h index ba877a1496..64c49fe68e 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h +++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h | |||
@@ -82,6 +82,8 @@ void ata_reset(void); | |||
82 | void ata_device_init(void); | 82 | void ata_device_init(void); |
83 | bool ata_is_coldstart(void); | 83 | bool ata_is_coldstart(void); |
84 | void ide_power_enable(bool on); | 84 | void ide_power_enable(bool on); |
85 | #ifdef BOOTLOADER | ||
85 | int load_minifs_file(char* filename, unsigned char* location); | 86 | int load_minifs_file(char* filename, unsigned char* location); |
87 | #endif | ||
86 | 88 | ||
87 | #endif | 89 | #endif |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c index 97b33bdffe..7d85464b70 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "button-target.h" | 27 | #include "button-target.h" |
28 | #include "i2c-dm320.h" | 28 | #include "i2c-dm320.h" |
29 | #include "sprintf.h" | 29 | #include "sprintf.h" |
30 | #include "logf.h" | ||
30 | 31 | ||
31 | #ifdef BUTTON_DEBUG | 32 | #ifdef BUTTON_DEBUG |
32 | #include "lcd-target.h" | 33 | #include "lcd-target.h" |
@@ -36,22 +37,22 @@ | |||
36 | 37 | ||
37 | #ifndef ZEN_VISION | 38 | #ifndef ZEN_VISION |
38 | /* Creative Zen Vision:M */ | 39 | /* Creative Zen Vision:M */ |
39 | #define BTN_LEFT 0x5F00 | 40 | #define BTN_LEFT 0xAF00 |
40 | #define BTN_RIGHT 0x4F00 | 41 | #define BTN_RIGHT 0xA700 |
41 | #define BTN_BACK 0xBF00 | 42 | #define BTN_BACK 0xDF00 |
42 | #define BTN_CUSTOM 0x8F00 | 43 | #define BTN_CUSTOM 0xC700 |
43 | #define BTN_PLAY 0x2F00 | 44 | #define BTN_PLAY 0x9700 |
44 | #define BTN_POWER 0x0F00 | 45 | #define BTN_POWER 0x8700 |
45 | #define BTN_MENU 0x9F00 | 46 | #define BTN_MENU 0xCF00 |
46 | #define BTN_HOLD 0x9F06 | 47 | #define BTN_HOLD 0xCF07 |
47 | #define BTN_UNHOLD 0xAF06 | 48 | #define BTN_UNHOLD 0xD707 |
48 | 49 | ||
49 | #define BTN_REL 1 | 50 | #define BTN_REL 1 |
50 | 51 | ||
51 | #define BTN_TOUCHPAD_PRESS 0x1F00 | 52 | #define BTN_TOUCHPAD_PRESS 0x8F00 |
52 | #define BTN_TOUCHPAD_SCROLL_DOWN 0x0F03 | 53 | #define BTN_TOUCHPAD_SCROLL_DOWN 0x0F03 |
53 | #define BTN_TOUCHPAD_CORNER_DOWN 0xAF00 | 54 | #define BTN_TOUCHPAD_CORNER_DOWN 0xD700 |
54 | #define BTN_TOUCHPAD_CORNER_UP 0x3F00 | 55 | #define BTN_TOUCHPAD_CORNER_UP 0x9F00 |
55 | #define BTN_TOUCHPAD_SCROLL_UP 0x0F04 | 56 | #define BTN_TOUCHPAD_SCROLL_UP 0x0F04 |
56 | 57 | ||
57 | #define HEADPHONE_PLUGIN_A 0x5707 | 58 | #define HEADPHONE_PLUGIN_A 0x5707 |
@@ -63,8 +64,8 @@ | |||
63 | #define DOCK_UNPLUG 0xDF06 | 64 | #define DOCK_UNPLUG 0xDF06 |
64 | #define DOCK_USB_INSERT 0x2F06 | 65 | #define DOCK_USB_INSERT 0x2F06 |
65 | #define DOCK_USB_UNPLUG 0x3F06 | 66 | #define DOCK_USB_UNPLUG 0x3F06 |
66 | #define DOCK_POWER_INSERT 0x2707 | 67 | #define DOCK_POWER_INSERT 0x1707 |
67 | #define DOCK_POWER_UNPLUG 0x2F07 | 68 | #define DOCK_POWER_UNPLUG 0x1F07 |
68 | 69 | ||
69 | #else | 70 | #else |
70 | /* Creative Zen Vision */ | 71 | /* Creative Zen Vision */ |
@@ -272,6 +273,8 @@ void GIO0(void) | |||
272 | lcd_update(); | 273 | lcd_update(); |
273 | sw = !sw; | 274 | sw = !sw; |
274 | #endif | 275 | #endif |
276 | logf("PIC: 0x%x", (unsigned int)((msg[3] << 24) | | ||
277 | (msg[2] << 16) | (msg[1] << 8) | msg[0])); | ||
275 | } | 278 | } |
276 | 279 | ||
277 | static void send_command_to_pic(const unsigned char in, unsigned char* out, | 280 | static void send_command_to_pic(const unsigned char in, unsigned char* out, |
@@ -335,7 +338,8 @@ bool button_usb_connected(void) | |||
335 | { | 338 | { |
336 | return (bool)(nonbtn & NONBUTTON_USB); | 339 | return (bool)(nonbtn & NONBUTTON_USB); |
337 | } | 340 | } |
338 | 341 | ||
342 | #ifndef BOOTLOADER | ||
339 | int pic_dbg_num_items(void) | 343 | int pic_dbg_num_items(void) |
340 | { | 344 | { |
341 | return 13; | 345 | return 13; |
@@ -376,3 +380,4 @@ char* pic_dbg_item(int selected_item, void *data, char *buffer, size_t buffer_le | |||
376 | } | 380 | } |
377 | return NULL; | 381 | return NULL; |
378 | } | 382 | } |
383 | #endif | ||
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/usb-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/usb-creativezvm.c index 9b362f003c..d3f7789ab0 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/usb-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/usb-creativezvm.c | |||
@@ -37,7 +37,7 @@ bool usb_drv_connected(void) | |||
37 | 37 | ||
38 | int usb_detect(void) | 38 | int usb_detect(void) |
39 | { | 39 | { |
40 | if(button_usb_connected()) | 40 | if(usb_drv_connected()) |
41 | return USB_INSERTED; | 41 | return USB_INSERTED; |
42 | else | 42 | else |
43 | return USB_EXTRACTED; | 43 | return USB_EXTRACTED; |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h index 260ddad7cf..6b56d8c5c0 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h +++ b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h | |||
@@ -65,11 +65,11 @@ | |||
65 | b = value >> 16; | 65 | b = value >> 16; |
66 | 66 | ||
67 | 67 | ||
68 | #define ZVM_SPECIFIC asm volatile( \ | 68 | /*#define ZVM_SPECIFIC asm volatile( \ |
69 | "LDR R12, =0x50FFC000\n" \ | 69 | "LDR R12, =0x50FFC000\n" \ |
70 | "LDRH R12, [R12]\n" \ | 70 | "LDRH R12, [R12]\n" \ |
71 | : : : "r12") | 71 | : : : "r12");*/ |
72 | //#define ZVM_SPECIFIC | 72 | #define ZVM_SPECIFIC |
73 | 73 | ||
74 | #define USE_IRAM | 74 | #define USE_IRAM |
75 | 75 | ||