From c0b43a5ac2fcda473800b9c9a4036c5348ac5084 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Fri, 21 Nov 2008 12:50:06 +0000 Subject: Commit some USB and ATA rework/refactoring (+ USB GPIO detection). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19165 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-ondavx747.h | 6 +++--- firmware/export/jz4740.h | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h index 3d7628fa8f..e92e5a9829 100644 --- a/firmware/export/config-ondavx747.h +++ b/firmware/export/config-ondavx747.h @@ -33,8 +33,8 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 35 -#define HAVE_ATA_SD -#define HAVE_HOTSWAP +//#define HAVE_ATA_SD +//#define HAVE_HOTSWAP //#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) #define CONFIG_STORAGE STORAGE_RAMDISK /* Multivolume currently handled at firmware/target/ level */ @@ -156,7 +156,7 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" -#define CONFIG_USBOTG USBOTG_INGENIC +#define CONFIG_USBOTG USBOTG_JZ4740 #define HAVE_USBSTACK #define USB_VENDOR_ID 0x041e #define USB_PRODUCT_ID 0x4133 diff --git a/firmware/export/jz4740.h b/firmware/export/jz4740.h index 45767b26cc..55c0ac7b1d 100644 --- a/firmware/export/jz4740.h +++ b/firmware/export/jz4740.h @@ -383,7 +383,7 @@ #define REG_TCU_TCNT4 REG16(TCU_TCNT4) #define REG_TCU_TCSR4 REG16(TCU_TCSR4) -// n = 0,1,2,3,4,5 +// n = 0,1,2,3,4,5,6,7 #define TCU_TDFR(n) (TCU_BASE + (0x40 + (n)*0x10)) /* Timer Data Full Reg */ #define TCU_TDHR(n) (TCU_BASE + (0x44 + (n)*0x10)) /* Timer Data Half Reg */ #define TCU_TCNT(n) (TCU_BASE + (0x48 + (n)*0x10)) /* Timer Counter Reg */ @@ -2903,11 +2903,11 @@ do { \ /* * MSC_CMD, MSC_CLK, MSC_D0 ~ MSC_D3 */ -#define __gpio_as_msc() \ -do { \ +#define __gpio_as_msc() \ +do { \ REG_GPIO_PXFUNS(3) = 0x00003f00; \ REG_GPIO_PXSELC(3) = 0x00003f00; \ - REG_GPIO_PXPES(3) = 0x00003f00; \ + REG_GPIO_PXPES(3) = 0x00003f00; \ } while (0) /* @@ -3027,8 +3027,8 @@ do { \ REG_GPIO_PXDIRS(p) = (1 << (o)); \ } while (0) -#define __gpio_port_as_input(p, o) \ -do { \ +#define __gpio_port_as_input(p, o) \ +do { \ REG_GPIO_PXFUNC(p) = (1 << (o)); \ REG_GPIO_PXSELC(p) = (1 << (o)); \ REG_GPIO_PXDIRC(p) = (1 << (o)); \ @@ -4168,9 +4168,9 @@ do { \ #define __msc_rd_rxfifo() ( REG_MSC_RXFIFO ) #define __msc_wr_txfifo(v) ( REG_MSC_TXFIFO = v ) -#define __msc_reset() \ -do { \ - REG_MSC_STRPCL = MSC_STRPCL_RESET; \ +#define __msc_reset() \ +do { \ + REG_MSC_STRPCL = MSC_STRPCL_RESET; \ while (REG_MSC_STAT & MSC_STAT_IS_RESETTING); \ } while (0) -- cgit v1.2.3