From 04ae1db3318e5538a28ee2b5ff7429622524231b Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Sat, 19 Jun 2010 20:40:07 +0000 Subject: as3525v2-usb: end of massive renaming git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26972 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/as3525/usb-drv-as3525v2.c | 72 +++---- firmware/target/arm/as3525/usb-drv-as3525v2.h | 292 ++++++++++++++------------ 2 files changed, 190 insertions(+), 174 deletions(-) (limited to 'firmware/target/arm') diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c index 951e0b0687..d420c113b7 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525v2.c +++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c @@ -144,8 +144,8 @@ static void flush_tx_fifos(int nums) { unsigned int i = 0; - GRSTCTL = (GRSTCTL & (~GRSTCTL_txfnum_bits)) - | (nums << GRSTCTL_txfnum_bit_pos) + GRSTCTL = (GRSTCTL & ~bitm(GRSTCTL, txfnum)) + | (nums << GRSTCTL_txfnum_bitp) | GRSTCTL_txfflsh_flush; while(GRSTCTL & GRSTCTL_txfflsh_flush && i < 0x300) i++; @@ -209,8 +209,8 @@ static void reset_endpoints(void) * Setup EP0 IN/OUT with 64 byte maximum packet size and activate both. Enable transfer on EP0 OUT */ - DOEPTSIZ(0) = (1 << DEPTSIZ0_supcnt_bit_pos) - | (1 << DEPTSIZ0_pkcnt_bit_pos) + DOEPTSIZ(0) = (1 << DEPTSIZ0_supcnt_bitp) + | (1 << DEPTSIZ0_pkcnt_bitp) | 8; /* setup DMA */ @@ -219,10 +219,10 @@ static void reset_endpoints(void) /* Enable endpoint, clear nak */ DOEPCTL(0) = DEPCTL_epena | DEPCTL_cnak | DEPCTL_usbactep - | (DEPCTL_MPS_8 << DEPCTL_mps_bit_pos); + | (DEPCTL_MPS_8 << DEPCTL_mps_bitp); /* 64 bytes packet size, active endpoint */ - DIEPCTL(0) = (DEPCTL_MPS_8 << DEPCTL_mps_bit_pos) + DIEPCTL(0) = (DEPCTL_MPS_8 << DEPCTL_mps_bitp) | DEPCTL_usbactep; DCTL = DCTL_cgnpinnak | DCTL_cgoutnak; @@ -236,22 +236,22 @@ static void core_dev_init(void) /* Restart the phy clock */ PCGCCTL = 0; /* Set phy speed : high speed */ - DCFG = (DCFG & ~DCFG_devspd_bits) | DCFG_devspd_hs_phy_hs; + DCFG = (DCFG & ~bitm(DCFG, devspd)) | DCFG_devspd_hs_phy_hs; /* Check hardware capabilities */ - if(extract(GHWCFG2, ARCH) != INT_DMA_ARCH) - panicf("usb: wrong architecture (%ld)", extract(GHWCFG2, ARCH)); - if(extract(GHWCFG2, HS_PHY_TYPE) != PHY_TYPE_UTMI) - panicf("usb: wrong HS phy type (%ld)", extract(GHWCFG2, HS_PHY_TYPE)); - if(extract(GHWCFG2, FS_PHY_TYPE) != PHY_TYPE_UNSUPPORTED) - panicf("usb: wrong FS phy type (%ld)", extract(GHWCFG2, FS_PHY_TYPE)); - if(GHWCFG4_UTMI_PHY_DATA_WIDTH != 0x2) - panicf("usb: wrong utmi data width (%ld)", GHWCFG4_UTMI_PHY_DATA_WIDTH); - if(GHWCFG4_DED_FIFO_EN != 1) /* it seems to be multiple tx fifo support */ + if(extract(GHWCFG2, arch) != GHWCFG2_ARCH_INTERNAL_DMA) + panicf("usb: wrong architecture (%ld)", extract(GHWCFG2, arch)); + if(extract(GHWCFG2, hs_phy_type) != GHWCFG2_PHY_TYPE_UTMI) + panicf("usb: wrong HS phy type (%ld)", extract(GHWCFG2, hs_phy_type)); + if(extract(GHWCFG2, fs_phy_type) != GHWCFG2_PHY_TYPE_UNSUPPORTED) + panicf("usb: wrong FS phy type (%ld)", extract(GHWCFG2, fs_phy_type)); + if(extract(GHWCFG4, utmi_phy_data_width) != 0x2) + panicf("usb: wrong utmi data width (%ld)", extract(GHWCFG4, utmi_phy_data_width)); + if(!(GHWCFG4 & GHWCFG4_ded_fifo_en)) /* it seems to be multiple tx fifo support */ panicf("usb: no multiple tx fifo"); #ifdef USE_CUSTOM_FIFO_LAYOUT - if(!(GHWCFG2 & GHWCFG2_DYN_FIFO)) + if(!(GHWCFG2 & GHWCFG2_dyn_fifo)) panicf("usb: no dynamic fifo"); if(GRXFSIZ != DATA_FIFO_DEPTH) panicf("usb: wrong data fifo size"); @@ -263,10 +263,10 @@ static void core_dev_init(void) logf("hwcfg3: %08lx", GHWCFG3); logf("hwcfg4: %08lx", GHWCFG4); - logf("%ld endpoints", extract(GHWCFG2, NUM_EP)); + logf("%ld endpoints", extract(GHWCFG2, num_ep)); num_in_ep = 0; num_out_ep = 0; - for(i = 0; i < extract(GHWCFG2, NUM_EP); i++) + for(i = 0; i < extract(GHWCFG2, num_ep); i++) { if(GHWCFG1 & GHWCFG1_IN_EP(i)) num_in_ep++; @@ -277,8 +277,8 @@ static void core_dev_init(void) GHWCFG1 & GHWCFG1_OUT_EP(i) ? "yes" : "no"); } - if(num_in_ep != GHWCFG4_NUM_IN_EP) - panicf("usb: num in ep mismatch(%d,%lu)", num_in_ep, GHWCFG4_NUM_IN_EP); + if(num_in_ep != extract(GHWCFG4, num_in_ep)) + panicf("usb: num in ep mismatch(%d,%lu)", num_in_ep, extract(GHWCFG4, num_in_ep)); if(num_in_ep != NUM_IN_EP) panicf("usb: num in ep static mismatch(%u,%u)", num_in_ep, NUM_IN_EP); if(num_out_ep != NUM_OUT_EP) @@ -287,7 +287,7 @@ static void core_dev_init(void) logf("%d in ep, %d out ep", num_in_ep, num_out_ep); logf("initial:"); - logf(" tot fifo sz: %lx", GHWCFG3_DFIFO_LEN); + logf(" tot fifo sz: %lx", extract(GHWCFG3, dfifo_len)); logf(" rx fifo: [%04x,+%4lx]", 0, GRXFSIZ); logf(" nptx fifo: [%04lx,+%4lx]", GET_FIFOSIZE_START_ADR(GNPTXFSIZ), GET_FIFOSIZE_DEPTH(GNPTXFSIZ)); @@ -344,9 +344,9 @@ static void core_dev_init(void) logf("threshold control:"); logf(" non_iso_thr_en: %d", (DTHRCTL & DTHRCTL_non_iso_thr_en) ? 1 : 0); logf(" iso_thr_en: %d", (DTHRCTL & DTHRCTL_iso_thr_en) ? 1 : 0); - logf(" tx_thr_len: %lu", (DTHRCTL & DTHRCTL_tx_thr_len_bits) >> DTHRCTL_tx_thr_len_bit_pos); + logf(" tx_thr_len: %lu", extract(DTHRCTL, tx_thr_len)); logf(" rx_thr_en: %d", (DTHRCTL & DTHRCTL_rx_thr_en) ? 1 : 0); - logf(" rx_thr_len: %lu", (DTHRCTL & DTHRCTL_rx_thr_len_bits) >> DTHRCTL_rx_thr_len_bit_pos); + logf(" rx_thr_len: %lu", extract(DTHRCTL, rx_thr_len)); */ DTHRCTL = 0; @@ -365,7 +365,7 @@ static void core_init(void) /* fixme: the current code is for internal DMA only, the clip+ architecture * define the internal DMA model */ /* Set burstlen and enable DMA*/ - GAHBCFG = (GAHBCFG_INT_DMA_BURST_INCR4 << GAHBCFG_hburstlen_bit_pos) + GAHBCFG = (GAHBCFG_INT_DMA_BURST_INCR4 << GAHBCFG_hburstlen_bitp) | GAHBCFG_dma_enable; /* Disable HNP and SRP, not sure it's useful because we already forced dev mode */ GUSBCFG &= ~(GUSBCFG_srpcap | GUSBCFG_hnpcapp); @@ -422,7 +422,7 @@ static bool handle_reset(void) reset_endpoints(); /* Reset Device Address */ - DCFG &= ~DCFG_devadr_bits; + DCFG &= bitm(DCFG, devadr); usb_core_bus_reset(); @@ -450,7 +450,7 @@ static bool handle_enum_done(void) logf("DCFG=%lx", DCFG); logf("DTHRCTL=%lx", DTHRCTL); - switch((DSTS & DSTS_enumspd_bits) >> DSTS_enumspd_bit_pos) + switch(extract(DSTS, enumspd)) { case DSTS_ENUMSPD_HS_PHY_30MHZ_OR_60MHZ: logf("usb: HS"); @@ -463,23 +463,7 @@ static bool handle_enum_done(void) panicf("usb: LS is not supported"); } - DOEPCTL(0) = (DOEPCTL(0) & ~DEPCTL_mps_bits) - | (DEPCTL_MPS_64 << DEPCTL_mps_bit_pos); - DIEPCTL(0) = (DIEPCTL(0) & ~DEPCTL_mps_bits) - | (DEPCTL_MPS_64 << DEPCTL_mps_bit_pos); - - unsigned i, ep; - FOR_EACH_IN_EP(i, ep) - DIEPCTL(ep) = (DIEPCTL(ep) & ~DEPCTL_mps_bits) - | (512 << DEPCTL_mps_bit_pos); - - FOR_EACH_OUT_EP(i, ep) - DOEPCTL(ep) = (DOEPCTL(ep) & ~DEPCTL_mps_bits) - | (512 << DEPCTL_mps_bit_pos); - - DOEPTSIZ(0) = (1 << DEPTSIZ0_supcnt_bit_pos) - | (1 << DEPTSIZ0_pkcnt_bit_pos) - | 64; + /* fixme: change EP0 mps here */ return true; } diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.h b/firmware/target/arm/as3525/usb-drv-as3525v2.h index 96b13f2028..0f5714eadd 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525v2.h +++ b/firmware/target/arm/as3525/usb-drv-as3525v2.h @@ -24,15 +24,26 @@ #include "as3525v2.h" /* All multi-bit fields in the driver use the following convention. - * If the register name is NAME, then there is one define NAME_bit_pos + * If the register name is NAME, then there is one define NAME_bitp * which holds the bit position and one define NAME_bits which holds - * a mask of the bits within the register. + * a mask of the bits within the register (after shift). * These macros allow easy access and construction of such fields */ /* Usage: * - extract(reg_name,field_name) - note: the field_name must not be prefix with the reg name */ + * extract a field of the register + * - bitm(reg_name,field_name) + * build a bitmask for the field + * - make(reg_name,field_name,value) + * build the value of the field (doesn't mask) + */ #define extract(reg_name, field_name) \ - ((reg_name & reg_name##_##field_name##_bits) >> reg_name##_##field_name##_bit_pos) + ((reg_name >> reg_name##_##field_name##_bitp) & reg_name##_##field_name##_bits) + +#define bitm(reg_name, field_name) \ + (reg_name##_##field_name##_bits << reg_name##_##field_name##_bitp) + +#define make(reg_name, field_name, value) \ + ((value) << reg_name##_##field_name##_bitp) #define USB_DEVICE (USB_BASE + 0x0800) /** USB Device base address */ @@ -50,7 +61,7 @@ /** Core AHB Configuration Register */ #define GAHBCFG BASE_REG(0x008) #define GAHBCFG_glblintrmsk (1 << 0) /** Global interrupt mask */ -#define GAHBCFG_hburstlen_bit_pos 1 +#define GAHBCFG_hburstlen_bitp 1 #define GAHBCFG_INT_DMA_BURST_SINGLE 0 #define GAHBCFG_INT_DMA_BURST_INCR 1 /** note: the linux patch has several other value, this is one picked for internal dma */ #define GAHBCFG_INT_DMA_BURST_INCR4 3 @@ -60,8 +71,8 @@ /** Core USB Configuration Register */ #define GUSBCFG BASE_REG(0x00C) -#define GUSBCFG_toutcal_bit_pos 0 -#define GUSBCFG_toutcal_bits (0x7 << GUSBCFG_toutcal_bit_pos) +#define GUSBCFG_toutcal_bitp 0 +#define GUSBCFG_toutcal_bits 0x7 #define GUSBCFG_phy_if (1 << 3) /** select utmi bus width ? */ #define GUSBCFG_ulpi_utmi_sel (1 << 4) /** select ulpi:1 or utmi:0 */ #define GUSBCFG_fsintf (1 << 5) @@ -69,8 +80,8 @@ #define GUSBCFG_ddrsel (1 << 7) #define GUSBCFG_srpcap (1 << 8) #define GUSBCFG_hnpcapp (1 << 9) -#define GUSBCFG_usbtrdtim_bit_pos 10 -#define GUSBCFG_usbtrdtim_bits (0xf << GUSBCFG_usbtrdtim_bit_pos) +#define GUSBCFG_usbtrdtim_bitp 10 +#define GUSBCFG_usbtrdtim_bits 0xf #define GUSBCFG_nptxfrwnden (1 << 14) #define GUSBCFG_phylpwrclksel (1 << 15) #define GUSBCFG_otgutmifssel (1 << 16) @@ -91,8 +102,8 @@ #define GRSTCTL_intknqflsh (1 << 3) /** In Token Sequence Learning Queue Flush */ #define GRSTCTL_rxfflsh_flush (1 << 4) /** RxFIFO Flush */ #define GRSTCTL_txfflsh_flush (1 << 5) /** TxFIFO Flush */ -#define GRSTCTL_txfnum_bit_pos 6 /** TxFIFO Number */ -#define GRSTCTL_txfnum_bits (0x1f << 6) +#define GRSTCTL_txfnum_bitp 6 /** TxFIFO Number */ +#define GRSTCTL_txfnum_bits 0x1f #define GRSTCTL_ahbidle (1 << 31) /** AHB idle state*/ /** Core Interrupt Register */ @@ -166,25 +177,32 @@ /** User HW Config2 Register */ #define GHWCFG2 BASE_REG(0x048) -#define GHWCFG2_ARCH_bit_pos 3 /** Architecture */ -#define GHWCFG2_ARCH_bits (0x3 << GHWCFG2_ARCH_bit_pos) -#define GHWCFG2_HS_PHY_TYPE_bit_pos 6 /** High speed PHY type */ -#define GHWCFG2_HS_PHY_TYPE_bits (0x3 << GHWCFG2_HS_PHY_TYPE_bit_pos) -#define GHWCFG2_FS_PHY_TYPE_bit_pos 8 /** Full speed PHY type */ -#define GHWCFG2_FS_PHY_TYPE_bits (0x3 << GHWCFG2_FS_PHY_TYPE_bit_pos) -#define GHWCFG2_NUM_EP_bit_pos 10 /** Number of endpoints */ -#define GHWCFG2_NUM_EP_bits (0xf << GHWCFG2_NUM_EP_bit_pos) -#define GHWCFG2_DYN_FIFO (1 << 19) /** Dynamic FIFO */ -/* For GHWCFG2_HS_PHY_TYPE and GHWCFG2_SS_PHY_TYPE */ -#define PHY_TYPE_UNSUPPORTED 0 -#define PHY_TYPE_UTMI 1 -#define INT_DMA_ARCH 2 +#define GHWCFG2_arch_bitp 3 /** Architecture */ +#define GHWCFG2_arch_bits 0x3 +#define GHWCFG2_hs_phy_type_bitp 6 /** High speed PHY type */ +#define GHWCFG2_hs_phy_type_bits 0x3 +#define GHWCFG2_fs_phy_type_bitp 8 /** Full speed PHY type */ +#define GHWCFG2_fs_phy_type_bits 0x3 +#define GHWCFG2_num_ep_bitp 10 /** Number of endpoints */ +#define GHWCFG2_num_ep_bits 0xf +#define GHWCFG2_dyn_fifo (1 << 19) /** Dynamic FIFO */ +/* For GHWCFG2_HS_PHY_TYPE and GHWCFG2_FS_PHY_TYPE */ +#define GHWCFG2_PHY_TYPE_UNSUPPORTED 0 +#define GHWCFG2_PHY_TYPE_UTMI 1 +#define GHWCFG2_ARCH_INTERNAL_DMA 2 /** User HW Config3 Register */ -#define GHWCFG3 BASE_REG(0x04C) +#define GHWCFG3 BASE_REG(0x04C) +#define GHWCFG3_dfifo_len_bitp 16 /** Total fifo size */ +#define GHWCFG3_dfifo_len_bits 0xffff /** User HW Config4 Register */ -#define GHWCFG4 BASE_REG(0x050) +#define GHWCFG4 BASE_REG(0x050) +#define GHWCFG4_utmi_phy_data_width_bitp 14 /** UTMI+ data bus width */ +#define GHWCFG4_utmi_phy_data_width_bits 0x3 +#define GHWCFG4_ded_fifo_en (1 << 25) /** Dedicated Tx FIFOs */ +#define GHWCFG4_num_in_ep_bitp 26 /** Number of IN endpoints */ +#define GHWCFG4_num_in_ep_bits 0xf /* 1<=ep<=15, don't use ep=0 !!! */ /** Device IN Endpoint Transmit FIFO (ep) Size Register */ @@ -200,100 +218,58 @@ #define GET_FIFOSIZE_START_ADR(data) \ ((data) & 0xffff) - - - - -#define GHWCFG3_DFIFO_LEN (GHWCFG3 >> 16) /** Total fifo size */ - -#define GHWCFG4_UTMI_PHY_DATA_WIDTH ((GHWCFG4 >> 14) & 0x3) /** UTMI+ data bus width (format is unsure) */ -#define GHWCFG4_DED_FIFO_EN ((GHWCFG4 >> 25) & 0x1) /** Dedicated Tx FIFOs */ -#define GHWCFG4_NUM_IN_EP ((GHWCFG4 >> 26) & 0xf) /** Number of IN endpoints */ - - - /** * Device Registers Base Addresses */ #define DEV_REG(offset) (*(volatile unsigned long *)(USB_DEVICE + offset)) -#define DCFG DEV_REG(0x00) /** Device Configuration Register */ -#define DCTL DEV_REG(0x04) /** Device Control Register */ -#define DSTS DEV_REG(0x08) /** Device Status Register */ -#define DIEPMSK DEV_REG(0x10) /** Device IN Endpoint Common Interrupt Mask Register */ -#define DOEPMSK DEV_REG(0x14) /** Device OUT Endpoint Common Interrupt Mask Register */ -#define DAINT DEV_REG(0x18) /** Device All Endpoints Interrupt Register */ -#define DAINTMSK DEV_REG(0x1C) /** Device Endpoints Interrupt Mask Register */ -#define DTKNQR1 DEV_REG(0x20) /** Device IN Token Sequence Learning Queue Read Register 1 */ -#define DTKNQR2 DEV_REG(0x24) /** Device IN Token Sequence Learning Queue Register 2 */ -#define DTKNQP DEV_REG(0x28) /** Device IN Token Queue Pop register */ -/* fixme: those registers are not present in registers.h but are in dwc_otgh_regs.h. - * the previous registers exists but has a different name :( */ -#define DVBUSDIS DEV_REG(0x28) /** Device VBUS discharge register*/ -#define DVBUSPULSE DEV_REG(0x2C) /** Device VBUS pulse register */ -#define DTKNQR3 DEV_REG(0x30) /** Device IN Token Queue Read Register 3 (RO) */ -#define DTHRCTL DEV_REG(0x30) /** Device Thresholding control register */ -#define DTKNQR4 DEV_REG(0x34) /** Device IN Token Queue Read Register 4 (RO) */ -#define FFEMPTYMSK DEV_REG(0x34) /** Device IN EPs empty Inr. Mask Register */ - -#define DCTL_rmtwkupsig (1 << 0) /** Remote Wakeup */ -#define DCTL_sftdiscon (1 << 1) /** Soft Disconnect */ -#define DCTL_gnpinnaksts (1 << 2) /** Global Non-Periodic IN NAK Status */ -#define DCTL_goutnaksts (1 << 3) /** Global OUT NAK Status */ -#define DCTL_tstctl_bit_pos 4 /** Test Control */ -#define DCTL_tstctl_bits (0x7 << DCTL_tstctl_bit_pos) -#define DCTL_sgnpinnak (1 << 7) /** Set Global Non-Periodic IN NAK */ -#define DCTL_cgnpinnak (1 << 8) /** Clear Global Non-Periodic IN NAK */ -#define DCTL_sgoutnak (1 << 9) /** Set Global OUT NAK */ -#define DCTL_cgoutnak (1 << 10) /** Clear Global OUT NAK */ +/** Device Configuration Register */ +#define DCFG DEV_REG(0x00) +#define DCFG_devspd_bitp 0 /** Device Speed */ +#define DCFG_devspd_bits 0x3 +#define DCFG_devspd_hs_phy_hs 0 /** High speed PHY running at high speed */ +#define DCFG_devspd_hs_phy_fs 1 /** High speed PHY running at full speed */ +#define DCFG_nzstsouthshk (1 << 2) /** Non Zero Length Status OUT Handshake */ +#define DCFG_devadr_bitp 4 /** Device Address */ +#define DCFG_devadr_bits 0x7f +#define DCFG_perfrint_bitp 11 /** Periodic Frame Interval */ +#define DCFG_perfrint_bits 0x3 +#define DCFG_FRAME_INTERVAL_80 0 +#define DCFG_FRAME_INTERVAL_85 1 +#define DCFG_FRAME_INTERVAL_90 2 +#define DCFG_FRAME_INTERVAL_95 3 + +/** Device Control Register */ +#define DCTL DEV_REG(0x04) +#define DCTL_rmtwkupsig (1 << 0) /** Remote Wakeup */ +#define DCTL_sftdiscon (1 << 1) /** Soft Disconnect */ +#define DCTL_gnpinnaksts (1 << 2) /** Global Non-Periodic IN NAK Status */ +#define DCTL_goutnaksts (1 << 3) /** Global OUT NAK Status */ +#define DCTL_tstctl_bitp 4 /** Test Control */ +#define DCTL_tstctl_bits 0x7 +#define DCTL_sgnpinnak (1 << 7) /** Set Global Non-Periodic IN NAK */ +#define DCTL_cgnpinnak (1 << 8) /** Clear Global Non-Periodic IN NAK */ +#define DCTL_sgoutnak (1 << 9) /** Set Global OUT NAK */ +#define DCTL_cgoutnak (1 << 10) /** Clear Global OUT NAK */ /* "documented" in constants.h only */ -#define DCTL_pwronprgdone (1 << 11) /** Power on Program Done ? */ - -#define DCFG_devspd_bits 0x3 /** Device Speed */ -#define DCFG_devspd_hs_phy_hs 0 /** High speed PHY running at high speed */ -#define DCFG_devspd_hs_phy_fs 1 /** High speed PHY running at full speed */ -#define DCFG_nzstsouthshk (1 << 2) /** Non Zero Length Status OUT Handshake */ -#define DCFG_devadr_bit_pos 4 /** Device Address */ -#define DCFG_devadr_bits (0x7f << DCFG_devadr_bit_pos) -#define DCFG_perfrint_bit_pos 11 /** Periodic Frame Interval */ -#define DCFG_perfrint_bits (0x3 << DCFG_perfrint_bit_pos) -#define DCFG_FRAME_INTERVAL_80 0 -#define DCFG_FRAME_INTERVAL_85 1 -#define DCFG_FRAME_INTERVAL_90 2 -#define DCFG_FRAME_INTERVAL_95 3 - -#define DSTS_suspsts (1 << 0) /** Suspend status */ -#define DSTS_enumspd_bit_pos 1 /** Enumerated speed */ -#define DSTS_enumspd_bits (0x3 << DSTS_enumspd_bit_pos) +#define DCTL_pwronprgdone (1 << 11) /** Power on Program Done ? */ + +/** Device Status Register */ +#define DSTS DEV_REG(0x08) +#define DSTS_suspsts (1 << 0) /** Suspend status */ +#define DSTS_enumspd_bitp 1 /** Enumerated speed */ +#define DSTS_enumspd_bits 0x3 #define DSTS_ENUMSPD_HS_PHY_30MHZ_OR_60MHZ 0 #define DSTS_ENUMSPD_FS_PHY_30MHZ_OR_60MHZ 1 #define DSTS_ENUMSPD_LS_PHY_6MHZ 2 #define DSTS_ENUMSPD_FS_PHY_48MHZ 3 -#define DSTS_errticerr (1 << 3) /** Erratic errors ? */ -#define DSTS_soffn_bit_pos 7 /** Frame or Microframe Number of the received SOF */ -#define DSTS_soffn_bits (0x3fff << DSTS_soffn_bit_pos) - -#define DTHRCTL_non_iso_thr_en (1 << 0) -#define DTHRCTL_iso_thr_en (1 << 1) -#define DTHRCTL_tx_thr_len_bit_pos 2 -#define DTHRCTL_tx_thr_len_bits (0x1FF << DTHRCTL_tx_thr_len_bit_pos) -#define DTHRCTL_rx_thr_en (1 << 16) -#define DTHRCTL_rx_thr_len_bit_pos 17 -#define DTHRCTL_rx_thr_len_bits (0x1FF << DTHRCTL_rx_thr_len_bit_pos) - -/* 0<=ep<=15, you can use ep=0 */ -/** Device IN Endpoint (ep) Control Register */ -#define DIEPCTL(ep) DEV_REG(0x100 + (ep) * 0x20) -/** Device IN Endpoint (ep) Interrupt Register */ -#define DIEPINT(ep) DEV_REG(0x100 + (ep) * 0x20 + 0x8) -/** Device IN Endpoint (ep) Transfer Size Register */ -#define DIEPTSIZ(ep) DEV_REG(0x100 + (ep) * 0x20 + 0x10) -/** Device IN Endpoint (ep) DMA Address Register */ -#define DIEPDMA(ep) DEV_REG(0x100 + (ep) * 0x20 + 0x14) -/** Device IN Endpoint (ep) Transmit FIFO Status Register */ -#define DTXFSTS(ep) DEV_REG(0x100 + (ep) * 0x20 + 0x18) +#define DSTS_errticerr (1 << 3) /** Erratic errors ? */ +#define DSTS_soffn_bitp 7 /** Frame or Microframe Number of the received SOF */ +#define DSTS_soffn_bits 0x3fff -/* the following also apply to DIEPMSK */ +/** Device IN Endpoint Common Interrupt Mask Register */ +#define DIEPMSK DEV_REG(0x10) +/* the following apply to DIEPMSK and DIEPINT */ #define DIEPINT_xfercompl (1 << 0) /** Transfer complete */ #define DIEPINT_epdisabled (1 << 1) /** Endpoint disabled */ #define DIEPINT_ahberr (1 << 2) /** AHB error */ @@ -304,12 +280,72 @@ #define DIEPINT_emptyintr (1 << 7) /** linux doc broken on this, empty fifo ? */ #define DIEPINT_txfifoundrn (1 << 8) /** linux doc void on this, tx fifo underrun ? */ -/* the following also apply to DOEPMSK */ +/** Device OUT Endpoint Common Interrupt Mask Register */ +#define DOEPMSK DEV_REG(0x14) +/* the following apply to DOEPMSK and DOEPINT */ #define DOEPINT_xfercompl (1 << 0) /** Transfer complete */ #define DOEPINT_epdisabled (1 << 1) /** Endpoint disabled */ #define DOEPINT_ahberr (1 << 2) /** AHB error */ #define DOEPINT_setup (1 << 3) /** Setup Phase Done (control EPs)*/ +/** Device All Endpoints Interrupt Register */ +#define DAINT DEV_REG(0x18) +/* valid for DAINT and DAINTMSK, for 0<=ep<=15 */ +#define DAINT_IN_EP(i) (1 << (i)) +#define DAINT_OUT_EP(i) (1 << ((i) + 16)) + +/** Device Endpoints Interrupt Mask Register */ +#define DAINTMSK DEV_REG(0x1C) + +/** Device IN Token Sequence Learning Queue Read Register 1 */ +#define DTKNQR1 DEV_REG(0x20) + +/** Device IN Token Sequence Learning Queue Register 2 */ +#define DTKNQR2 DEV_REG(0x24) + +/** Device IN Token Queue Pop register */ +#define DTKNQP DEV_REG(0x28) + +/* fixme: those registers are not present in registers.h but are in dwc_otgh_regs.h. + * the previous registers exists but has a different name :( */ +/** Device VBUS discharge register*/ +#define DVBUSDIS DEV_REG(0x28) + +/** Device VBUS pulse register */ +#define DVBUSPULSE DEV_REG(0x2C) + +/** Device IN Token Queue Read Register 3 (RO) */ +#define DTKNQR3 DEV_REG(0x30) + +/** Device Thresholding control register */ +#define DTHRCTL DEV_REG(0x30) +#define DTHRCTL_non_iso_thr_en (1 << 0) +#define DTHRCTL_iso_thr_en (1 << 1) +#define DTHRCTL_tx_thr_len_bitp 2 +#define DTHRCTL_tx_thr_len_bits 0x1FF +#define DTHRCTL_rx_thr_en (1 << 16) +#define DTHRCTL_rx_thr_len_bitp 17 +#define DTHRCTL_rx_thr_len_bits 0x1FF + +/** Device IN Token Queue Read Register 4 (RO) */ +#define DTKNQR4 DEV_REG(0x34) + +/** Device IN EPs empty Inr. Mask Register */ +#define FFEMPTYMSK DEV_REG(0x34) + + +/* 0<=ep<=15, you can use ep=0 */ +/** Device IN Endpoint (ep) Control Register */ +#define DIEPCTL(ep) DEV_REG(0x100 + (ep) * 0x20) +/** Device IN Endpoint (ep) Interrupt Register */ +#define DIEPINT(ep) DEV_REG(0x100 + (ep) * 0x20 + 0x8) +/** Device IN Endpoint (ep) Transfer Size Register */ +#define DIEPTSIZ(ep) DEV_REG(0x100 + (ep) * 0x20 + 0x10) +/** Device IN Endpoint (ep) DMA Address Register */ +#define DIEPDMA(ep) DEV_REG(0x100 + (ep) * 0x20 + 0x14) +/** Device IN Endpoint (ep) Transmit FIFO Status Register */ +#define DTXFSTS(ep) DEV_REG(0x100 + (ep) * 0x20 + 0x18) + /* 0<=ep<=15, you can use ep=0 */ /** Device OUT Endpoint (ep) Control Register */ #define DOEPCTL(ep) DEV_REG(0x300 + (ep) * 0x20) @@ -332,8 +368,8 @@ * 2'b01: 32 * 2'b10: 16 * 2'b11: 8 */ +#define DEPCTL_mps_bitp 0 #define DEPCTL_mps_bits 0x7ff -#define DEPCTL_mps_bit_pos 0 #define DEPCTL_MPS_64 0 #define DEPCTL_MPS_32 1 #define DEPCTL_MPS_16 2 @@ -341,8 +377,8 @@ /** Next Endpoint * IN EPn/IN EP0 * OUT EPn/OUT EP0 - reserved */ -#define DEPCTL_nextep_bit_pos 11 -#define DEPCTL_nextep_bits (0xf << DEPCTL_nextep_bit_pos) +#define DEPCTL_nextep_bitp 11 +#define DEPCTL_nextep_bits 0xf #define DEPCTL_usbactep (1 << 15) /** USB Active Endpoint */ /** Endpoint DPID (INTR/Bulk IN and OUT endpoints) * This field contains the PID of the packet going to @@ -365,8 +401,8 @@ * 2'b01: Isochronous * 2'b10: Bulk * 2'b11: Interrupt */ -#define DEPCTL_eptype_bit_pos 18 -#define DEPCTL_eptype_bits (0x3 << DEPCTL_eptype_bit_pos) +#define DEPCTL_eptype_bitp 18 +#define DEPCTL_eptype_bits 0x3 /** Snoop Mode * OUT EPn/OUT EP0 * IN EPn/IN EP0 - reserved */ @@ -375,8 +411,8 @@ /** Tx Fifo Number * IN EPn/IN EP0 * OUT EPn/OUT EP0 - reserved */ -#define DEPCTL_txfnum_bit_pos 22 -#define DEPCTL_txfnum_bits (0xf << DEPCTL_txfnum_bit_pos) +#define DEPCTL_txfnum_bitp 22 +#define DEPCTL_txfnum_bits 0xf #define DEPCTL_cnak (1 << 26) /** Clear NAK */ #define DEPCTL_snak (1 << 27) /** Set NAK */ @@ -403,21 +439,17 @@ /* valid for any D{I,O}EPTSIZi with 1<=i<=15, NOT for i=0 ! */ #define DEPTSIZ_xfersize_bits 0x7ffff /** Transfer Size */ -#define DEPTSIZ_pkcnt_bit_pos 19 /** Packet Count */ -#define DEPTSIZ_pkcnt_bits (0x3ff << DEPTSIZ_pkcnt_bit_pos) -#define DEPTSIZ_mc_bit_pos 29 /** Multi Count - Periodic IN endpoints */ -#define DEPTSIZ_mc_bits (0x3 << DEPTSIZ_mc_bit_pos) +#define DEPTSIZ_pkcnt_bitp 19 /** Packet Count */ +#define DEPTSIZ_pkcnt_bits 0x3ff +#define DEPTSIZ_mc_bitp 29 /** Multi Count - Periodic IN endpoints */ +#define DEPTSIZ_mc_bits 0x3 /* idem but for i=0 */ -#define DEPTSIZ0_xfersize_bits 0x7f /** Transfer Size */ -#define DEPTSIZ0_pkcnt_bit_pos 19 /** Packet Count */ -#define DEPTSIZ0_pkcnt_bits (0x1 << DEPTSIZ0_pkcnt_bit_pos) -#define DEPTSIZ0_supcnt_bit_pos 29 /** Setup Packet Count (DOEPTSIZ0 Only) */ -#define DEPTSIZ0_supcnt_bits (0x3 << DEPTSIZ0_supcnt_bit_pos) - -/* valid for DAINT and DAINTMSK, for 0<=ep<=15 */ -#define DAINT_IN_EP(i) (1 << (i)) -#define DAINT_OUT_EP(i) (1 << ((i) + 16)) +#define DEPTSIZ0_xfersize_bits 0x7f /** Transfer Size */ +#define DEPTSIZ0_pkcnt_bitp 19 /** Packet Count */ +#define DEPTSIZ0_pkcnt_bits 0x1 +#define DEPTSIZ0_supcnt_bitp 29 /** Setup Packet Count (DOEPTSIZ0 Only) */ +#define DEPTSIZ0_supcnt_bits 0x3 /** * Parameters -- cgit v1.2.3