Index: sys/usb/src.km/config.h =================================================================== RCS file: /mint/freemint/sys/usb/src.km/config.h,v retrieving revision 1.1 diff -u -8 -p -r1.1 config.h --- sys/usb/src.km/config.h 29 Apr 2011 11:39:28 -0000 1.1 +++ sys/usb/src.km/config.h 5 Mar 2013 19:10:12 -0000 @@ -15,28 +15,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ #ifndef _CONFIG_H #define _CONFIG_H -//#define ARCH m68k -//#define COLDFIRE /* Besides change one(first) .chip in bios.S 68060 or 5200 */ -/* Change .chip in detxbios.S 68060 or 5200 */ - /*----- USB -----*/ //#define CONFIG_LEGACY_USB_INIT_SEQ //#define CONFIG_USB_INTERRUPT_POLLING -/*----- ISP116x-HCD ------*/ -#define ISP116X_HCD_USE_UDELAY -//#define ISP116X_HCD_USE_EXTRA_DELAY -//#define ISP116X_HCD_SEL15kRES -//#define ISP116X_HCD_OC_ENABLE -//#define ISP116X_HCD_REMOTE_WAKEUP_ENABLE -//#define ISP116X_HCD_INT_EDGE_TRIGGERED -#define ISP116X_HCD_INT_ACT_HIGH -/*----- OHCI-HCI -----*/ -#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 -//#define PCI_XBIOS # endif /* _CONFIG_H */ Index: sys/usb/src.km/ucd/ethernat/isp116x.h =================================================================== RCS file: /mint/freemint/sys/usb/src.km/ucd/ethernat/isp116x.h,v retrieving revision 1.1 diff -u -8 -p -r1.1 isp116x.h --- sys/usb/src.km/ucd/ethernat/isp116x.h 29 Apr 2011 11:39:28 -0000 1.1 +++ sys/usb/src.km/ucd/ethernat/isp116x.h 5 Mar 2013 19:10:16 -0000 @@ -53,22 +53,33 @@ /* Buffer sizes */ #define ISP116x_BUF_SIZE 4096 #define ISP116x_ITL_BUFSIZE 0 #define ISP116x_ATL_BUFSIZE ((ISP116x_BUF_SIZE) - 2*(ISP116x_ITL_BUFSIZE)) #define ISP116x_WRITE_OFFSET 0x80 +/* --- Board settings -------------------------------------------------------*/ + +#define ISP116X_HCD_INT_ACT_HIGH 1 +#define ISP116X_HCD_INT_EDGE_TRIGGERED 0 +#define ISP116X_HCD_SEL15kRES 0 +#define ISP116X_HCD_OC_ENABLE 0 +#define ISP116X_HCD_REMOTE_WAKEUP_ENABLE 0 +#define ISP116X_HCD_USE_UDELAY 1 +#define ISP116X_HCD_USE_EXTRA_DELAY 0 + /* --- ISP116x address registers in EtherNAT --------------------------------*/ #define ISP116X_HCD_ADDR 0x80000016 #define ISP116X_HCD_DATA 0x80000012 //#define ETHERNAT_CPLD_CR 0x80000023 /* 0x80000023 - 1 */ volatile unsigned char* const ETHERNAT_CPLD_CR = (volatile unsigned char*) 0x80000023; + /* --- ISP116x registers/bits ---------------------------------------------- */ #define HCREVISION 0x00 #define HCCONTROL 0x01 #define HCCONTROL_HCFS (3UL << 6) /* host controller functional state */ #define HCCONTROL_USB_RESET (0UL << 6) #define HCCONTROL_USB_RESUME (1UL << 6) Index: sys/usb/src.km/ucd/netusbee/isp116x-hcd.c =================================================================== RCS file: /mint/freemint/sys/usb/src.km/ucd/netusbee/isp116x-hcd.c,v retrieving revision 1.1 diff -u -8 -p -r1.1 isp116x-hcd.c --- sys/usb/src.km/ucd/netusbee/isp116x-hcd.c 22 May 2011 21:24:56 -0000 1.1 +++ sys/usb/src.km/ucd/netusbee/isp116x-hcd.c 5 Mar 2013 19:10:24 -0000 @@ -94,17 +94,16 @@ * ISP116x chips require certain delays between accesses to its * registers. The following timing options exist. * * 1. Configure your memory controller (the best) * 2. Use ndelay (easiest, poorest). For that, enable the following macro. * * Value is in microseconds. */ -#undef ISP116X_HCD_USE_UDELAY #ifdef ISP116X_HCD_USE_UDELAY # define UDELAY 1 #endif /* * On some (slowly?) machines an extra delay after data packing into * controller's FIFOs is required, * otherwise you may get the following * error: @@ -118,17 +117,16 @@ * isp116x: isp116x_submit_job: ****** FIFO not empty! ****** * isp116x: isp116x_submit_job: ****** FIFO not empty! ****** * isp116x: isp116x_submit_job: ****** FIFO not empty! ****** * 3 USB Device(s) found * scanning bus for storage devices... 0 Storage Device(s) found * * Value is in milliseconds. */ -#define ISP116X_HCD_USE_EXTRA_DELAY #ifdef ISP116X_HCD_USE_EXTRA_DELAY # define EXTRA_DELAY 10 /* DEFAULT 2 */ #endif /* * Debug section */ @@ -1916,21 +1914,19 @@ usb_lowlevel_init(long dummy1, const str /* Setup specific board settings */ #ifdef ISP116X_HCD_INT_ACT_HIGH isp116x_board.int_act_high = 1; #endif #ifdef ISP116X_HCD_INT_EDGE_TRIGGERED isp116x_board.int_edge_triggered = 1; #endif -#define ISP116X_HCD_SEL15kRES #ifdef ISP116X_HCD_SEL15kRES isp116x_board.sel15Kres = 1; #endif -#define ISP116X_HCD_OC_ENABLE #ifdef ISP116X_HCD_OC_ENABLE isp116x_board.oc_enable = 1; #endif #ifdef ISP116X_HCD_REMOTE_WAKEUP_ENABLE isp116x_board.remote_wakeup_enable = 1; #endif isp116x->board = &isp116x_board; Index: sys/usb/src.km/ucd/netusbee/isp116x.h =================================================================== RCS file: /mint/freemint/sys/usb/src.km/ucd/netusbee/isp116x.h,v retrieving revision 1.2 diff -u -8 -p -r1.2 isp116x.h --- sys/usb/src.km/ucd/netusbee/isp116x.h 30 Jul 2011 19:21:00 -0000 1.2 +++ sys/usb/src.km/ucd/netusbee/isp116x.h 5 Mar 2013 19:10:24 -0000 @@ -52,16 +52,26 @@ /* Buffer sizes */ #define ISP116x_BUF_SIZE 4096 #define ISP116x_ITL_BUFSIZE 0 #define ISP116x_ATL_BUFSIZE ((ISP116x_BUF_SIZE) - 2*(ISP116x_ITL_BUFSIZE)) #define ISP116x_WRITE_OFFSET 0x80 +/* --- Board settings -------------------------------------------------------*/ + +#define ISP116X_HCD_INT_ACT_HIGH 1 +#define ISP116X_HCD_INT_EDGE_TRIGGERED 0 +#define ISP116X_HCD_SEL15kRES 1 +#define ISP116X_HCD_OC_ENABLE 1 +#define ISP116X_HCD_REMOTE_WAKEUP_ENABLE 0 +#define ISP116X_HCD_USE_UDELAY 0 +#define ISP116X_HCD_USE_EXTRA_DELAY 1 + /* --- ISP116x address registers in Netusbee --------------------------------*/ #define ISP116X_HCD_ADDR 0x00FBC000 #define ISP116X_HCD_DATA 0x00FA0000 /* --- ISP116x registers/bits ---------------------------------------------- */ #define HCREVISION 0x00