diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-12-04 18:26:19 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-12-04 18:26:19 +0000 |
commit | a119c44c7ec7a383dafbb391f052aaade0b6c981 (patch) | |
tree | 166f1ebc5dad5c132adeca9376ad323023f55a28 /firmware/export | |
parent | b2dd3c210e909baec303a94463dc5517acc2780a (diff) | |
download | rockbox-a119c44c7ec7a383dafbb391f052aaade0b6c981.tar.gz rockbox-a119c44c7ec7a383dafbb391f052aaade0b6c981.zip |
Ingenic targets:
* Clean up codec & PCM + functional changes
* LCD: Don't wait on DMAC in lcd_unlock()
* SADC: add battery mutex + other changes
* NAND: add mutex
* USB rework (still not working)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19327 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/jz4740.h | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/firmware/export/jz4740.h b/firmware/export/jz4740.h index 55c0ac7b1d..505248a67a 100644 --- a/firmware/export/jz4740.h +++ b/firmware/export/jz4740.h | |||
@@ -2339,6 +2339,7 @@ | |||
2339 | #define USB_REG_TESTMODE (USB_BASE + 0x0f) /* USB test mode 8-bit */ | 2339 | #define USB_REG_TESTMODE (USB_BASE + 0x0f) /* USB test mode 8-bit */ |
2340 | 2340 | ||
2341 | #define USB_REG_CSR0 (USB_BASE + 0x12) /* EP0 CSR 8-bit */ | 2341 | #define USB_REG_CSR0 (USB_BASE + 0x12) /* EP0 CSR 8-bit */ |
2342 | #define USB_REG_COUNT0 (USB_BASE + 0x18) /* bytes in EP0 FIFO 16-bit */ | ||
2342 | #define USB_REG_INMAXP (USB_BASE + 0x10) /* EP1-2 IN Max Pkt Size 16-bit */ | 2343 | #define USB_REG_INMAXP (USB_BASE + 0x10) /* EP1-2 IN Max Pkt Size 16-bit */ |
2343 | #define USB_REG_INCSR (USB_BASE + 0x12) /* EP1-2 IN CSR LSB 8/16bit */ | 2344 | #define USB_REG_INCSR (USB_BASE + 0x12) /* EP1-2 IN CSR LSB 8/16bit */ |
2344 | #define USB_REG_INCSRH (USB_BASE + 0x13) /* EP1-2 IN CSR MSB 8-bit */ | 2345 | #define USB_REG_INCSRH (USB_BASE + 0x13) /* EP1-2 IN CSR MSB 8-bit */ |
@@ -2375,6 +2376,7 @@ | |||
2375 | #define REG_USB_REG_TESTMODE REG8(USB_REG_TESTMODE) | 2376 | #define REG_USB_REG_TESTMODE REG8(USB_REG_TESTMODE) |
2376 | 2377 | ||
2377 | #define REG_USB_REG_CSR0 REG8(USB_REG_CSR0) | 2378 | #define REG_USB_REG_CSR0 REG8(USB_REG_CSR0) |
2379 | #define REG_USB_REG_COUNT0 REG16(USB_REG_COUNT0) | ||
2378 | #define REG_USB_REG_INMAXP REG16(USB_REG_INMAXP) | 2380 | #define REG_USB_REG_INMAXP REG16(USB_REG_INMAXP) |
2379 | #define REG_USB_REG_INCSR REG16(USB_REG_INCSR) | 2381 | #define REG_USB_REG_INCSR REG16(USB_REG_INCSR) |
2380 | #define REG_USB_REG_INCSRH REG8(USB_REG_INCSRH) | 2382 | #define REG_USB_REG_INCSRH REG8(USB_REG_INCSRH) |
@@ -2395,6 +2397,9 @@ | |||
2395 | #define REG_USB_REG_ADDR2 REG32(USB_REG_ADDR2) | 2397 | #define REG_USB_REG_ADDR2 REG32(USB_REG_ADDR2) |
2396 | #define REG_USB_REG_COUNT2 REG32(USB_REG_COUNT2) | 2398 | #define REG_USB_REG_COUNT2 REG32(USB_REG_COUNT2) |
2397 | 2399 | ||
2400 | #define REG_USB_REG_EPINFO REG16(USB_REG_EPINFO) | ||
2401 | #define REG_USB_REG_RAMINFO REG8(USB_REG_RAMINFO) | ||
2402 | |||
2398 | 2403 | ||
2399 | /* Power register bit masks */ | 2404 | /* Power register bit masks */ |
2400 | #define USB_POWER_SUSPENDM 0x01 | 2405 | #define USB_POWER_SUSPENDM 0x01 |
@@ -2414,6 +2419,8 @@ | |||
2414 | #define USB_INTR_OUTEP1 0x0002 | 2419 | #define USB_INTR_OUTEP1 0x0002 |
2415 | #define USB_INTR_OUTEP2 0x0004 | 2420 | #define USB_INTR_OUTEP2 0x0004 |
2416 | 2421 | ||
2422 | #define USB_INTR_EP(n) (n*2) | ||
2423 | |||
2417 | /* CSR0 bit masks */ | 2424 | /* CSR0 bit masks */ |
2418 | #define USB_CSR0_OUTPKTRDY 0x01 | 2425 | #define USB_CSR0_OUTPKTRDY 0x01 |
2419 | #define USB_CSR0_INPKTRDY 0x02 | 2426 | #define USB_CSR0_INPKTRDY 0x02 |
@@ -2425,11 +2432,11 @@ | |||
2425 | #define USB_CSR0_SVDSETUPEND 0x80 | 2432 | #define USB_CSR0_SVDSETUPEND 0x80 |
2426 | 2433 | ||
2427 | /* Endpoint CSR register bits */ | 2434 | /* Endpoint CSR register bits */ |
2428 | #define USB_INCSRH_AUTOSET 0x80 | 2435 | #define USB_INCSRH_AUTOSET 0x8000 |
2429 | #define USB_INCSRH_ISO 0x40 | 2436 | #define USB_INCSRH_ISO 0x4000 |
2430 | #define USB_INCSRH_MODE 0x20 | 2437 | #define USB_INCSRH_MODE 0x2000 |
2431 | #define USB_INCSRH_DMAREQENAB 0x10 | 2438 | #define USB_INCSRH_DMAREQENAB 0x1000 |
2432 | #define USB_INCSRH_DMAREQMODE 0x04 | 2439 | #define USB_INCSRH_DMAREQMODE 0x0400 |
2433 | #define USB_INCSR_CDT 0x40 | 2440 | #define USB_INCSR_CDT 0x40 |
2434 | #define USB_INCSR_SENTSTALL 0x20 | 2441 | #define USB_INCSR_SENTSTALL 0x20 |
2435 | #define USB_INCSR_SENDSTALL 0x10 | 2442 | #define USB_INCSR_SENDSTALL 0x10 |
@@ -2437,11 +2444,11 @@ | |||
2437 | #define USB_INCSR_UNDERRUN 0x04 | 2444 | #define USB_INCSR_UNDERRUN 0x04 |
2438 | #define USB_INCSR_FFNOTEMPT 0x02 | 2445 | #define USB_INCSR_FFNOTEMPT 0x02 |
2439 | #define USB_INCSR_INPKTRDY 0x01 | 2446 | #define USB_INCSR_INPKTRDY 0x01 |
2440 | #define USB_OUTCSRH_AUTOCLR 0x80 | 2447 | #define USB_OUTCSRH_AUTOCLR 0x8000 |
2441 | #define USB_OUTCSRH_ISO 0x40 | 2448 | #define USB_OUTCSRH_ISO 0x4000 |
2442 | #define USB_OUTCSRH_DMAREQENAB 0x20 | 2449 | #define USB_OUTCSRH_DMAREQENAB 0x2000 |
2443 | #define USB_OUTCSRH_DNYT 0x10 | 2450 | #define USB_OUTCSRH_DNYT 0x1000 |
2444 | #define USB_OUTCSRH_DMAREQMODE 0x08 | 2451 | #define USB_OUTCSRH_DMAREQMODE 0x0800 |
2445 | #define USB_OUTCSR_CDT 0x80 | 2452 | #define USB_OUTCSR_CDT 0x80 |
2446 | #define USB_OUTCSR_SENTSTALL 0x40 | 2453 | #define USB_OUTCSR_SENTSTALL 0x40 |
2447 | #define USB_OUTCSR_SENDSTALL 0x20 | 2454 | #define USB_OUTCSR_SENDSTALL 0x20 |
@@ -2456,6 +2463,11 @@ | |||
2456 | #define USB_TEST_J 0x02 | 2463 | #define USB_TEST_J 0x02 |
2457 | #define USB_TEST_K 0x04 | 2464 | #define USB_TEST_K 0x04 |
2458 | #define USB_TEST_PACKET 0x08 | 2465 | #define USB_TEST_PACKET 0x08 |
2466 | #define USB_TEST_FORCE_HS 0x10 | ||
2467 | #define USB_TEST_FORCE_FS 0x20 | ||
2468 | #define USB_TEST_ALL ( USB_TEST_SE0NAK | USB_TEST_J \ | ||
2469 | | USB_TEST_K | USB_TEST_PACKET \ | ||
2470 | | USB_TEST_FORCE_HS | USB_TEST_FORCE_FS) | ||
2459 | 2471 | ||
2460 | /* DMA control bits */ | 2472 | /* DMA control bits */ |
2461 | #define USB_CNTL_ENA 0x01 | 2473 | #define USB_CNTL_ENA 0x01 |