.gitattributes

+**/Hdr/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
 **/s/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
 **/c/** gitlab-language=c linguist-language=c linguist-detectable=true
 **/h/** gitlab-language=c linguist-language=c linguist-detectable=true

VersionNum

-/* (0.49)
+/* (0.65)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.49
+#define Module_MajorVersion_CMHG        0.65
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                02 Oct 2009
+#define Module_Date_CMHG                18 Dec 2011
 
-#define Module_MajorVersion             "0.49"
-#define Module_Version                  49
+#define Module_MajorVersion             "0.65"
+#define Module_Version                  65
 #define Module_MinorVersion             ""
-#define Module_Date                     "02 Oct 2009"
+#define Module_Date                     "18 Dec 2011"
 
-#define Module_ApplicationDate          "02-Oct-09"
+#define Module_ApplicationDate          "18-Dec-11"
 
 #define Module_ComponentName            "NetBSD"
 #define Module_ComponentPath            "mixed/RiscOS/Sources/HWSupport/USB/NetBSD"
 
-#define Module_FullVersion              "0.49"
-#define Module_HelpVersion              "0.49 (02 Oct 2009)"
-#define Module_LibraryVersionInfo       "0:49"
+#define Module_FullVersion              "0.65"
+#define Module_HelpVersion              "0.65 (18 Dec 2011)"
+#define Module_LibraryVersionInfo       "0:65"

build/!MkHAL,fd7

+| Copyright 2011 Castle Technology Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
+Dir <Obey$Dir>
+amu_machine export PHASE=hdrs COMPONENT=USBDriver  THROWBACK=-throwback
+amu_machine export PHASE=libs COMPONENT=USBDriver  THROWBACK=-throwback
+amu_machine export PHASE=hdrs COMPONENT=OHCIDriver THROWBACK=-throwback
+amu_machine export PHASE=libs COMPONENT=OHCIDriver THROWBACK=-throwback
+amu_machine export PHASE=hdrs COMPONENT=EHCIDriver THROWBACK=-throwback
+amu_machine export PHASE=libs COMPONENT=EHCIDriver THROWBACK=-throwback

build/Hdr/usbhal

+; Copyright 2011 Castle Technology Ltd
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+
+; HAL USB workspace structure
+; This workspace shouldn't be poked directly by the HAL. The only reason
+; it gets exported is to allow USBHAL_WS_Size to be read, to allow the
+; correct amount of memory to be reserved in the HAL workspace at sb
+; USBHAL_WorkspaceOffset should then be set to the offset of this memory
+
+; Note: This must be kept in sync with the matching C struct in dev/usb/usbhal.h
+
+                        ^ 0
+USBHAL_WS_Heap_Normal   # 4 ; Heap structure for malloc & free
+USBHAL_WS_Heap_NCNB     # 4 ; Heap structure for malloc_contig & free_contig
+USBHAL_WS_allbuses      # 8 ; TAILQ of buses
+USBHAL_WS_usbbus_no     # 4 ; Next number to use
+USBHAL_WS_monotonictime # 4 ; Centisecond counter equivalent to OS_ReadMonotonicTime
+USBHAL_WS_callouts      # 4 ; Head of callouts list
+USBHAL_WS_irqsema       # 4 ; nonzero when processing interrupts
+USBHAL_WS_rediscover    # 4 ; re_discover callout
+USBHAL_WS_t_handles     # 4 ; tsleep handle list
+USBHAL_WS_t_locks       # 4 ; tsleep lock list
+USBHAL_WS_nhandles      # 4 ; tsleep handle count
+USBHAL_WS_kbdflags      # 4 ; Sticky keyboard scan bits
+USBHAL_WS_callbacks     # 4 ; Array of callbacks
+USBHAL_WS_nextcb        # 4 ; Index of next callback to run
+USBHAL_WS_numcb         # 4 ; Number of callbacks
+USBHAL_WS_Size          # 0
+
+        END

build/Makefile

@@ -29,7 +29,7 @@ USBDIR          = <Lib$Dir>.USB
 CINCLUDES       = -Itbox:,TCPIPLibs:,^.,OS:
 CDEFINES        += ${CDEBUG} -DKERNEL -D_KERNEL -Dpaddr_t=int -D__P(A)=A -DKLD_MODULE -DDISABLE_PACKED
 CMHGINCLUDES    = ${CINCLUDES}
-CMHGDEFINES     = -DMSGLOC=${MSGLOC} ${CDEBUG}
+CMHGDEFINES     = ${CDEBUG}
 CFLAGS          += -ff -wp -wc -zm -zps1
 LDFLAGS         = -LIST maps.${TARGET} -MAP -Xref -Symbols rm.sym${TARGET}
 
@@ -50,6 +50,7 @@ UNAME=	"RISC_OS"
 
 clean:
         ${WIPE} o      ${WFLAGS}
+        ${WIPE} o_hal  ${WFLAGS}
         ${WIPE} aif    ${WFLAGS}
         ${WIPE} aof    ${WFLAGS}
         ${WIPE} rm     ${WFLAGS}
@@ -69,13 +70,14 @@ all: o._dirs
 
 export: export_${PHASE}
 
-export_libs:
+export_libs: ${USBDIR}.o.${COMPONENT}
         @echo ${COMPONENT}: export complete (libs)
 
 export_hdrs:   ^.dev.usb.h.usbdevs
         ${MKDIR} ${USBDIR}.dev.usb.h
         ${MKDIR} ${USBDIR}.h
         ${MKDIR} ${USBDIR}.sys.h
+        ${MKDIR} ${USBDIR}.Hdr
         ${CP} ^.dev.usb.h.usb      ${USBDIR}.dev.usb.h.usb      ${CPFLAGS}
         ${CP} ^.dev.usb.h.usbdevs  ${USBDIR}.dev.usb.h.usbdevs  ${CPFLAGS}
         ${CP} ^.dev.usb.h.usbdi    ${USBDIR}.dev.usb.h.usbdi    ${CPFLAGS}
@@ -83,6 +85,7 @@ export_hdrs:   ^.dev.usb.h.usbdevs
         ${CP} h.USBDevFS           ${USBDIR}.h.USBDevFS         ${CPFLAGS}
         ${CP} ^.sys.h.device       ${USBDIR}.sys.h.device       ${CPFLAGS}
         ${CP} ^.VersionNum         ${USBDIR}.NetBSDVersion      ${CPFLAGS}
+        ${CP} Hdr.usbhal           ${USBDIR}.Hdr.usbhal         ${CPFLAGS}
         @echo ${COMPONENT}: export complete (hdrs)
 
 resources: resources_${COMPONENT}
@@ -105,6 +108,7 @@ resources_USBDriver: LocalRes:USBDriver ${DEVICELIST}
 
 o._dirs:
         ${MKDIR} o
+        ${MKDIR} o_hal
         ${MKDIR} aif
         ${MKDIR} aof
         ${MKDIR} rm
@@ -124,12 +128,8 @@ usbmodule.o usbkboard.o:        usbmodhead.h
 Resources.<Locale>.USBDevs: bin.makedevs ^.dev.usb.h.usbdevs ^.dev.usb.h.usbdevs_data
         ${RUN}bin.makedevs > Resources.<Locale>.USBDevs
 
-# Remove the usbmodhead after creating the SWI table because if OHCIDriver
-# makes it then it has the wrong messages file in it
 USBDriver.h: usbmodhead.h
         ${SED} -n "/define USBDriver_/p" h.usbmodhead > h.USBDriver
-        ${RM}   h.usbmodhead
-        ${RM}   o.usbmodhead
 
 bin.makedevs: c.makedevs ${CLIB} ${DIRS}
         ${MAKE} -f makedevs/mk COMPONENT=makedevs THROWBACK=${THROWBACK}
@@ -143,6 +143,15 @@ ohcimsgs.o: Resources.<Locale>.OHCIMessages
 ehcimsgs.o: Resources.<Locale>.EHCIMessages
         resgen resource_files o.ehcimsgs Resources.<Locale>.EHCIMessages ${MSGLOC}
 
+# HAL libraries:
+.SUFFIXES: .o_hal
+.c.o_hal:; ${CC} -APCS 3/nofp/noswst -wp -ff -DUSBHAL -c -depend !Depend -DKERNEL -D_KERNEL -Dpaddr_t=int -D__P(A)=A -DKLD_MODULE -DDISABLE_PACKED ${CINCLUDES} ${THROWBACK} -o $@ $<
+.s.o_hal:; ${AS} ${ASFLAGS} -APCS 3/nofp/noswst -o $@ $<
+
+${USBDIR}.o.${COMPONENT}: ${OBJS_HAL} ${DIRS}
+        ${MKDIR} ${USBDIR}.o
+        ${AR} ${ARFLAGS} ${USBDIR}.o.${COMPONENT} ${OBJS_HAL}
+
 # RISC OS debug:
 aif.${COMPONENT}: ${RAM_OBJS} ${RAM_LIBS} ${CLIB} ${DIRS}
         link -base 0 -aif -bin -d -o $@ ${RAM_OBJS} ${RAM_LIBS} ${CLIB}
@@ -165,5 +174,7 @@ bbe-usb: bbe-generic
         ${CP} rom_link_v.${TARGET} ${VERBATIMROMLINK} ${CPFLAGS}
         BBE_Export_File ^.VersionNum
 
+# Static dependencies:
+o.makedevs o.usbmouse: ^.dev.usb.h.usbdevs
 
 # Dynamic dependencies:

build/OBJEHCIDriver

@@ -8,4 +8,10 @@ ehci.o \
 port.o \
 call_veneer.o \
  \
-triggercbs.o
+triggercbs.o \
+usbroothub_subr.o
+
+OBJS_HAL = \
+o_hal.ehci \
+o_hal.usbroothub_subr \
+o_hal.ehcihal

build/OBJOHCIDriver

@@ -4,5 +4,9 @@ ohcimodule.o \
 ohci.o \
 port.o \
 call_veneer.o \
-triggercbs.o \
-ohcimsgs.o
+triggercbs.o
+
\ No newline at end of file
+RAM_OBJS = ${OBJS} ohcimsgs.o
+
+OBJS_HAL = \
+o_hal.ohci

build/OBJUSBDriver

@@ -13,5 +13,17 @@ usbkboard.o \
 hid.o \
 bufman.o \
 triggercbs.o \
-call_veneer.o \
-usbmsgs.o
+call_veneer.o
+
+RAM_OBJS = ${OBJS} usbmsgs.o
+
+OBJS_HAL = \
+o_hal.usb \
+o_hal.usbdi \
+o_hal.usb_subr \
+o_hal.usbdi_util \
+o_hal.usb_quirks \
+o_hal.uhub \
+o_hal.porthal \
+o_hal.halheap \
+o_hal.usbhal

build/Version

@@ -2,11 +2,11 @@
    VersionNum file really,as a work around define them here so the CMHG
    file remains unaltered */
 
-#define OHCIDriverModule_Module_Date_CMHG  31 Dec 2005
-#define OHCIDriverModule_MajorVersion_CMHG 0.29
+#define OHCIDriverModule_Module_Date_CMHG  04 Dec 2011
+#define OHCIDriverModule_MajorVersion_CMHG 0.37
 
-#define EHCIDriverModule_Module_Date_CMHG  15 May 2005
-#define EHCIDriverModule_MajorVersion_CMHG 0.14
+#define EHCIDriverModule_Module_Date_CMHG  18 Dec 2011
+#define EHCIDriverModule_MajorVersion_CMHG 0.21
         
-#define USBDriverModule_Module_Date_CMHG   22 Feb 2006
-#define USBDriverModule_MajorVersion_CMHG  0.47
+#define USBDriverModule_Module_Date_CMHG   10 Dec 2011
+#define USBDriverModule_MajorVersion_CMHG  0.55

build/c/ehcihal

+/* Copyright 2011 Castle Technology Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* HAL version of ehcimodule.c */
+#include <dev/usb/usbhal.h>
+
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <machine/bus.h>
+
+#include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/systm.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdivar.h>
+#include <dev/usb/ehcireg.h>
+#include <dev/usb/ehcivar.h>
+
+#include "Global/RISCOS.h"
+#include "Global/Services.h"
+#include "Global/HALEntries.h"
+
+/* Have to avoid including stdio as there's a clash with the BSD stuff */
+#define __stdio_h
+
+#include "DebugLib/DebugLib.h"
+#include "service.h"
+#include "oslib/devicefs.h"
+
+typedef struct
+{
+    int type;
+    int flags;
+    void *hw;
+    int devno;
+} usbinfo;
+
+extern size_t HAL_USBControllerInfo(int idx,usbinfo *info,size_t size);
+extern int HAL_IRQEnable(int device);
+extern int HAL_IRQDisable(int device);
+extern void HAL_IRQClear(int device);
+extern device_ptr_t register_bus(device_ptr_t bus);
+
+static void init_device(usbinfo *info,int idx)
+{
+	ehci_softc_t *ehci = malloc(sizeof(ehci_softc_t));
+	memset(ehci,0,sizeof(ehci_softc_t));
+	sprintf(ehci->sc_bus.bdev.dv_xname,"EHCI%d",idx);
+	ehci->sc_irqdevno = info->devno;
+	ehci->sc_ncomp = 2;
+	/* Abuse iot & ioh members to store base addr & flags */
+	ehci->iot = (bus_space_tag_t) info->hw;
+	ehci->ioh = (bus_space_handle_t) info->flags;
+	ehci_init(ehci);
+	/* Enable IRQ */
+	HAL_IRQEnable(ehci->sc_irqdevno);
+	/* Register with USBDriver */
+	register_bus((device_ptr_t) ehci);
+}
+
+void USBHAL_EHCIDriver_Init(void)
+{
+	/* Find and initialise all controllers. Note that this currently only
+	   supports controllers exposed via HAL_USBControllerInfo */
+	int idx=0;
+	do {
+		usbinfo info;
+		size_t usbinfolen = HAL_USBControllerInfo(idx,&info,sizeof(info));
+		if((usbinfolen >= sizeof(info)) && (info.type == 1))
+			init_device(&info,idx);
+		else if(!usbinfolen)
+			return;
+		idx++;
+	} while(1);
+}
+
+int usbhal_ehci_do_intr(struct usbd_bus *bus,int irqdevno)
+{
+	ehci_softc_t *sc = (ehci_softc_t *)bus;
+	if(irqdevno != sc->sc_irqdevno)
+		return 0;
+	int ret = ehci_intr(sc);
+	return ret;
+}
+
+void usbhal_ehci_shutdown(struct usbd_bus *bus)
+{
+	ehci_softc_t *sc = (ehci_softc_t *)bus;
+	/* Disable IRQ */
+	HAL_IRQDisable(sc->sc_irqdevno);
+	/* Reset controller */
+	EOWRITE4(sc, EHCI_USBCMD, 0);
+	EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET);
+	EOREAD4(sc, EHCI_USBCMD);/* flush the command */
+	/* Wait a bit */
+	delay(1000);
+	/* Clear any lingering IRQ */
+	HAL_IRQClear(sc->sc_irqdevno);
+}
+
+/* #define these because I'm feeling lazy */
+#define ehci_base ((volatile int *)iot)
+#define registers_32bit (((int)ioh) & 8)
+
+void bus_space_write_4 (bus_space_tag_t iot, bus_space_handle_t ioh, int o, int x)
+{
+    ehci_base[o>>2] = x;
+}
+
+int bus_space_read_4 (bus_space_tag_t iot, bus_space_handle_t ioh, int o)
+{
+    return ehci_base[o>>2];
+}
+
+void bus_space_write_2 (bus_space_tag_t iot, bus_space_handle_t ioh, int o, int x)
+{
+    if (registers_32bit)
+    {
+      x &= 0xFFFF;
+      if (o&2)
+        ehci_base[o>>2]=(ehci_base[o>>2]&0xFFFF)|(x<<16);
+      else
+        ehci_base[o>>2]=(ehci_base[o>>2]&0xFFFF0000)|x;
+    }
+    else
+      ((uint16_t*) ehci_base)[o>>1] = x;
+}
+
+int bus_space_read_2 (bus_space_tag_t iot, bus_space_handle_t ioh, int o)
+{
+    if (registers_32bit)
+    {
+      if (o&2)
+        return ((uint32_t*)ehci_base)[o>>2]>>16;
+      else
+        return ((uint32_t*)ehci_base)[o>>2]&0xFFFF;
+    }
+    return ((uint16_t*) ehci_base)[o>>1];
+}
+
+void bus_space_write_1 (bus_space_tag_t iot, bus_space_handle_t ioh, int o, int x)
+{
+    if (registers_32bit)
+    {
+      x &= 0xFF;
+      int t = ehci_base[o>>2];
+      t &= ~(0xFF<<((o&3)*8));
+      t |= x<<((o&3)*8);
+      ehci_base[o>>2] = t;
+    }
+    else
+      ((uint8_t*) ehci_base)[o] = x;
+}
+
+int bus_space_read_1 (bus_space_tag_t iot, bus_space_handle_t ioh, int o)
+{
+    if (registers_32bit)
+      return (((uint32_t*)ehci_base)[o/4]>>((o&3)*8))&0xff;
+    return ((uint8_t*) ehci_base)[o];
+}

build/c/ehcimodule

@@ -65,7 +65,7 @@ void* private_word;
 volatile int* ehci_base;
 
 ehci_softc_t ehci_soft;
-struct device * usb_soft;
+struct device * usb_soft = NULL;
 extern int * init_veneer (void);
 //extern void* resource_files (void);
 #ifdef EHCI_DEBUG
@@ -142,23 +142,21 @@ int unhandled_irqs;
 int registers_32bit=0;                    //(used with rhenium)
 #endif        /* RHENIUM */
 
-
-//_kernel_oserror* bus_register (_kernel_swi_regs* r, void* pw, void* h)
-//{
-//    /* register with the usbdriver module if it's already resident */
-//    dprintf (("", "Registering with USB driver\n"));
-//
-//    memset (&ehci_soft, 0, sizeof ehci_soft);
-//    sprintf (ehci_soft.sc_bus.bdev.dv_xname, "EHCI%d", instance);
-//    /* fix n companions */
-//    ehci_soft.sc_ncomp = 2;
-//    ehci_init (&ehci_soft);
-//
-//    _swix (USBDriver_RegisterBus, _IN(0)|_OUT(0),
-//            &ehci_soft, &usb_soft);
-//
-//    return NULL;
-//}
+_kernel_oserror* register_bus(void *in,struct device **out)
+{
+    *out = NULL;
+    /* Check USBDriver is new enough */
+    int version;
+    _kernel_oserror *e = _swix(USBDriver_Version,_OUT(0),&version);
+    if(e)
+        return e;
+    if(version < RISCOS_USBDRIVER_API_VERSION)
+        return (_kernel_oserror*)"\0\0\0\0USBDriver too old";
+    /* Now attempt to register */
+    e = _swix(USBDriver_RegisterBus, _INR(0,1)|_OUT(0),in,RISCOS_USBDRIVER_API_VERSION,out);
+    if(e) *out = NULL;
+    return e;
+}
 
 _kernel_oserror* new_instance (_kernel_swi_regs* r, void* pw, void* h)
 {
@@ -172,16 +170,15 @@ _kernel_oserror* new_instance (_kernel_swi_regs* r, void* pw, void* h)
 
     /* register with the usbdriver module if it's already resident */
     dprintf (("", "Registering with USB driver\n"));
-
-//    memset (&ehci_soft, 0, sizeof ehci_soft);
-//    sprintf (ehci_soft.sc_bus.bdev.dv_xname, "EHCI%d", instance);
-//    /* fix n companions */
-//    ehci_soft.sc_ncomp = 2;
-//    ehci_init (&ehci_soft);
-
-    _swix (USBDriver_RegisterBus, _IN(0)|_OUT(0),
-            &ehci_soft, &usb_soft);
-    dprintf (("", "Registering with USB driver-done\n"));
+    e = register_bus(&ehci_soft, &usb_soft);
+    if (e)
+    {
+        dprintf (("", "Failed to register: %s\n", e->errmess));
+    }
+    else
+    {
+        dprintf (("", "Registering with USB driver-done\n"));
+    }
 
 
     // allow enough space for name, % and number, then space, and
@@ -203,19 +200,6 @@ _kernel_oserror* new_instance (_kernel_swi_regs* r, void* pw, void* h)
 
 _kernel_oserror *module_init(const char *cmd_tail, int podule_base, void *pw) {
     _kernel_oserror* e = 0;
-#ifdef EHCI_DEBUG
-//    struct dev_struct {
-//        devicefs_device dev;
-//        int null;
-//        char name[32];
-//    }* dev = NULL;
-#endif    
-
-
-
-
-
-
 
     callx_init (pw);
 
@@ -348,27 +332,6 @@ _kernel_oserror *module_init(const char *cmd_tail, int podule_base, void *pw) {
 #ifdef EHCI_DEBUG
     usbdebug = ehcidebug = atoi (getenv ("ehcidebug"));
     irq0 = gettime () / 1000;
-
-//    dev = calloc (sizeof *dev, 1);
-//    strcpy (dev->name, ehci_soft.sc_bus.bdev.dv_xname);
-//
-//    dev->dev.name_offset = dev->name - (char*) dev;
-//    dev->dev.flags = 3;
-//    dev->dev.tx_flags = 0x8;
-//    dev->dev.tx_buffer_size = 0;
-//    dev->dev.rx_flags = 0x8;
-//    dev->dev.rx_buffer_size = 1024;
-//
-//    e = _swix (DeviceFS_Register, _INR (0, 7) | _OUT(0),
-//        4,
-//        dev,
-//        driver_entry,
-//        NULL,
-//        pw,
-//        NULL,
-//        INT_MAX, // XXX should be -1, but that doesn't seem to work
-//        INT_MAX,
-//        &irq_device);
 #endif
 
     _swix (OS_ClaimDeviceVector, _INR(0,4),
@@ -385,6 +348,7 @@ _kernel_oserror *module_init(const char *cmd_tail, int podule_base, void *pw) {
     memset (&ehci_soft, 0, sizeof ehci_soft);
 
     sprintf (ehci_soft.sc_bus.bdev.dv_xname, "EHCI%d", instance);
+    ehci_soft.sc_irqdevno = device_number;
 
     /* fix n companions */
     ehci_soft.sc_ncomp = 2;
@@ -455,17 +419,16 @@ void module_services(int service_number, _kernel_swi_regs *r, void *pw)
            case Service_USBDriver_Starting:
              if (usb_soft == NULL)
              {
-
-
-
-
-             dprintf (("", "Registering with USB driver from svcecall\n"));
-                    _swix (USBDriver_RegisterBus, _IN(0)|_OUT(0),
-                             &ehci_soft, &usb_soft);
-             dprintf (("", "Registering with USB driver from svcecall-done\n"));
-
-
-
+                 dprintf (("", "Registering with USB driver from svcecall\n"));
+                 _kernel_oserror *e = register_bus(&ehci_soft,&usb_soft);
+                 if(e)
+                 {
+                     dprintf (("", "Failed to register: %s\n", e->errmess));
+                 }
+                 else
+                 {
+                     dprintf (("", "Registering with USB driver from svcecall-done\n"));
+                 }
              }
              break;
            case Service_USBDriver_Dying:
@@ -841,11 +804,6 @@ softintr (_kernel_swi_regs* r, void* pw)
     return 1;
 }
 
-void riscos_irqclear()
-{
-    _swix(OS_Hardware, _IN(0)|_INR(8,9), device_number, 0, EntryNo_HAL_IRQClear);
-}
-
 /*---------------------------------------------------------------------------*/
 //#ifdef EHCI_DEBUG
 //

build/c/ohcimodule

@@ -76,7 +76,7 @@ void* private_word;
 volatile int* ohci_base;
 
 ohci_softc_t ohci_soft;
-struct device * usb_soft;
+struct device * usb_soft=NULL;
 extern int * init_veneer (void);
 extern void* resource_files (void);
 #ifdef OHCI_DEBUG
@@ -275,21 +275,26 @@ int do_ohci_perror(int port)
 
 #endif        /* RHENIUM */
 
-//_kernel_oserror* bus_register (_kernel_swi_regs* r, void* pw, void* h)
-//{
-//    /* register with the usbdriver module if it's already resident */
-//    dprintf (("", "Registering with USB driver\n"));
-//    _swix (USBDriver_RegisterBus, _IN(0)|_OUT(0),
-//            &ohci_soft, &usb_soft);
-//    dprintf (("", "Registering with USB driver-done\n"));
-//
-//    return NULL;
-//}
-//
+_kernel_oserror* register_bus(void *in,struct device **out)
+{
+    *out = NULL;
+    /* Check USBDriver is new enough */
+    int version;
+    _kernel_oserror *e = _swix(USBDriver_Version,_OUT(0),&version);
+    if(e)
+        return e;
+    if(version < RISCOS_USBDRIVER_API_VERSION)
+        return (_kernel_oserror*)"\0\0\0\0USBDriver too old";
+    /* Now attempt to register */
+    e = _swix(USBDriver_RegisterBus, _INR(0,1)|_OUT(0),in,RISCOS_USBDRIVER_API_VERSION,out);
+    if(e) *out = NULL;
+    return e;
+}
+
 _kernel_oserror* new_instance (_kernel_swi_regs* r, void* pw, void* h)
 {
     _kernel_oserror * e;
-    char* v;
+    char* v=NULL;
 
     (void) r;
     (void) pw;
@@ -315,9 +320,15 @@ _kernel_oserror* new_instance (_kernel_swi_regs* r, void* pw, void* h)
 #endif  /* RHENIUM */
     /* now we know the root hub info, register it with USBDriver */
     dprintf (("", "Init-Registering with USB driver\n"));
-    _swix (USBDriver_RegisterBus, _IN(0)|_OUT(0),
-            &ohci_soft, &usb_soft);
-    dprintf (("", "Init-Registering with USB driver-done\n"));
+    e = register_bus(&ohci_soft, &usb_soft);
+    if (e)
+    {
+        dprintf (("", "Failed to register: %s\n", e->errmess));
+    }
+    else
+    {
+        dprintf (("", "Init-Registering with USB driver-done\n"));
+    }
 
     /* allow enough space for name, % and number, then space, and
        another number */
@@ -501,6 +512,7 @@ _kernel_oserror *module_init(const char *cmd_tail, int podule_base, void *pw) {
     memset (&ohci_soft, 0, sizeof ohci_soft);
 
     sprintf (ohci_soft.sc_bus.bdev.dv_xname, "OHCI%d", instance);
+    ohci_soft.sc_irqdevno = device_number;
 
 
 #ifdef   RHENIUM
@@ -510,6 +522,7 @@ _kernel_oserror *module_init(const char *cmd_tail, int podule_base, void *pw) {
     {
 #endif  /* RHENIUM */
         _swix (PCI_ReadInfo, _INR(0,3), (1<<16), &v, 4, pci_device);
+        if (v == 0) v = (char *)" ";
         strncpy (ohci_soft.sc_vendor, v, sizeof ohci_soft.sc_vendor-1);
 //            [sizeof ohci_soft.sc_vendor - 1] = '\0';
 #ifdef   RHENIUM
@@ -704,10 +717,16 @@ void module_services(int service_number, _kernel_swi_regs *r, void *pw)
             {
                 if(ohci_soft.sc_vendor[0]!='\0') // (means svce_PCI has happened)
                 {   /* we're here in callback.. so foo we go */
-             dprintf (("", "Registering with USB driver from svcecall \n"));
-                   _swix (USBDriver_RegisterBus, _IN(0)|_OUT(0),
-                           &ohci_soft, &usb_soft);
-             dprintf (("", "Registering with USB driver from svcecall-done\n"));
+                    dprintf (("", "Registering with USB driver from svcecall\n"));
+                    _kernel_oserror *e = register_bus(&ohci_soft,&usb_soft);
+                    if(e)
+                    {
+                        dprintf (("", "Failed to register: %s\n", e->errmess));
+                    }
+                    else
+                    {
+                        dprintf (("", "Registering with USB driver from svcecall-done\n"));
+                    }
                 }
             }
             break;
@@ -725,6 +744,7 @@ void module_services(int service_number, _kernel_swi_regs *r, void *pw)
             {
 #endif  /* RHENIUM */
                 _swix (PCI_ReadInfo, _INR(0,3), (1<<16), &v, 4, pci_device);
+                if (v == 0) v = (char *)" ";
                 strncpy (ohci_soft.sc_vendor, v, sizeof ohci_soft.sc_vendor-1);
 //                    [sizeof ohci_soft.sc_vendor - 1] = '\0';
 #ifdef   RHENIUM
@@ -1035,8 +1055,3 @@ softintr (_kernel_swi_regs* r, void* pw)
     ohci_softintr ((void*) r->r[0]);
     return 0;
 }
-
-void riscos_irqclear()
-{
-    _swix(OS_Hardware, _IN(0)|_INR(8,9), device_number, 0, EntryNo_HAL_IRQClear);
-}

build/c/port

@@ -12,6 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/* This is the module version of port.c
+   For the HAL version, see usbhal.c and porthal.s
+*/
+
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
@@ -122,14 +127,6 @@ delay (int d)
     _swix (OS_Hardware, _IN(0)|_INR(8,9), d, 0, EntryNo_HAL_CounterDelay);
 }
 
-void
-microtime(struct timeval *thetime)
-{
-    uint64_t t = gettime ();
-    thetime->tv_sec = (unsigned long) (t / 1000000000);
-    thetime->tv_usec = (unsigned long) ((t / 1000) % 1000000);
-}
-
 void
 selrecord(struct proc *selector, struct selinfo *selinfo)
 {
@@ -179,8 +176,9 @@ extern int private_word;
 extern void callout_veneer (void);
 
 void
-callout_init (struct callout* c)
+callout_init (struct callout* c,int ignored)
 {
+    (void)ignored;
 #ifdef USB_DEBUG0
     if (usbdebug > 15) dprintf (("Port", "callout init %p\n", c));
 #endif
@@ -287,26 +285,20 @@ int tsleep (void* ident, int priority, const char* wmesg, int timo, int noblock)
     t_locks[i] = 0;
 
     /* wait until the lock is free */
-    int flags = 0;
-
     _kernel_irqs_on ();
+
     if (timo) {
         do {
             triggercbs ();
             t2 = gettime ();
-            _swix (OS_ReadEscapeState, _OUT(_FLAGS), &flags);
         }
-        while ((t_locks[i] == 0) && (t2 < t1) && ((flags & _C) == 0));
+        while ((t_locks[i] == 0) && (t2 < t1));
     }
     else
     {
-        while (t_locks[i] == 0 && (flags & _C) == 0)
+        while (t_locks[i] == 0)
         {
-            /* allow foreground process to function while we're waiting */
-/*            if (noblock) _swix (OS_UpCall, _INR(0,1), 6, &t_locks[i]);*/
-/*//            _swix (OS_UpCall, _INR(0,1), 6, &t_locks[i]);*/
             triggercbs ();
-            _swix (OS_ReadEscapeState, _OUT(_FLAGS), &flags);
         }
 #ifdef USB_DEBUG0
         t2 = gettime ();
@@ -314,11 +306,6 @@ int tsleep (void* ident, int priority, const char* wmesg, int timo, int noblock)
     }
     _kernel_irqs_off ();
 
-    if (flags & _C)
-    {
-        _kernel_osbyte (126, 0, 0);
-    }
-
     t_handles[i] = 0;
 
 #ifdef USB_DEBUG0
@@ -469,3 +456,8 @@ void softintr_disestablish (void* p)
     free (p);
 }
 #endif
+
+void riscos_irqclear(int devno)
+{
+    _swix(OS_Hardware, _IN(0)|_INR(8,9), devno, 0, EntryNo_HAL_IRQClear);
+}

build/c/usbmodule

@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/* Changed 17.02.2010 TM DeviceFSCallDevice_TransferInfo and notation of padded bytes. */
 #include "usbmodhead.h"
 #include <stdio.h>
 #include <string.h>
@@ -66,8 +67,11 @@
 #define DeviceFSCallDevice_GetHandles       0x80000003
 #define DeviceFSCallDevice_GetLocation      0x80000004
 #define DeviceFSCallDevice_ClearStall       0x80000005
+#define DeviceFSCallDevice_TransferInfo     0x80000006
+#define DeviceFSCallDevice_GetHandles2      0x80000007
+#define DeviceFSCallDevice_GetSetOptions    0x80000008
 
-
+/* Was this used by the Castle podule at some time? - JL
 #define DeviceFSCallDevice_GetConfig        0x80000001
 #define DeviceFSCallDevice_SetConfig        0x80000002
 #define DeviceFSCallDevice_GetAltInterface  0x80000003
@@ -78,6 +82,7 @@
 #define DeviceFSCallDevice_GetInterfaceDesc 0x80000008
 #define DeviceFSCallDevice_GetEndpointDesc  0x80000009
 #define DeviceFSCallDevice_GetString        0x8000000a
+*/
 
 struct ugen_softc;
 
@@ -114,6 +119,11 @@ struct devstream {
     int bandwidth; /* isochronous bandwidth */
     int residue;
     int dying;
+    int padded_bytes; /* only greater 0 in case of short packages */
+    int flags; /* Flags altered by the GetSetOptions call */
+#define FLAG_NOPAD 1
+#define FLAG_SHORT 2
+#define FLAG_VALIDMASK 3 /* Which bits can be modified */
     struct isoc_buffer * isoc;
 };
 
@@ -335,9 +345,9 @@ _kernel_oserror *module_init(const char *cmd_tail, int podule_base, void *pw)
 #else
     /* if standalone then this happens in the service call handler */
     e = messages_update (&mod_messages);
-    if (e) goto error0;
+    if (e) return e;
     e = messages_update (&usbdev_messages);
-    if (e) goto error1;
+    if (e) goto error;
 #endif
 
 #ifdef USB_DEBUG
@@ -358,12 +368,10 @@ _kernel_oserror *module_init(const char *cmd_tail, int podule_base, void *pw)
 
     return 0;
 #ifndef STANDALONE
-error1:
+error:
     _swix (MessageTrans_CloseFile, _IN(0), &mod_messages);
-error0:
-    _swix (ResourceFS_DeregisterFiles, _IN (0), resource_files ());
-#endif
     return e;
+#endif
 }
 
 /*---------------------------------------------------------------------------*/
@@ -439,7 +447,7 @@ _kernel_oserror* RegisterNewDevice(struct ugen_softc * softc,int no)
         driver_entry,
         softc,
         private_word,
-        "endpoint/Ninterface/Nalternate/Nreport/Ncontrol,isochronous,bulk,interrupt/Susbtimeout/Nsize/N",
+        "endpoint/Ninterface/Nalternate/Nreport/Ncontrol,isochronous,bulk,interrupt/Susbtimeout/Nsize/Nnopad/Sshort/S",
 #ifdef DEVICEFSISBROKEN
         INT_MAX, // should be -1, but that doesn't seem to work
         INT_MAX,
@@ -1060,11 +1068,11 @@ static void deregister_bus (device_ptr_t bus)
 _kernel_oserror *module_swis(int swi_offset, _kernel_swi_regs *r, void *pw)
 {
     switch (swi_offset) {
-//    case USBDriver_Register:
-//        break;
-//    case USBDriver_DeRegister:
-//        break;
     case USBDriver_RegisterBus - USBDriver_00:
+        /* R1 now contains internal API version number
+           This check should be made more permissive when appropriate */
+        if(r->r[1] != RISCOS_USBDRIVER_API_VERSION)
+            return (_kernel_oserror *)"\0\0\0\0Incompatible USBDriver version";
         r->r[0] = (int) register_bus ((device_ptr_t) r->r[0]);
         break;
 
@@ -1088,6 +1096,9 @@ _kernel_oserror *module_swis(int swi_offset, _kernel_swi_regs *r, void *pw)
                 usb_schedsoftintr (*(void**) (bus + 1));
         }
         break;
+    case USBDriver_Version - USBDriver_00:
+        r->r[0] = Module_VersionNumber;
+        break;
     default:
         return error_BAD_SWI;
     }
@@ -1334,7 +1345,6 @@ int detach_hub (struct device* hub)
 
 /*---------------------------------------------------------------------------*/
 
-
 #ifdef OBSOLETE_SERVICE_CALLS
 /* returns non-zero if not handed */
 char* service_call (usbd_device_handle dev, int unit, int link)
@@ -1718,6 +1728,8 @@ int detach_device (struct device* dev, int d)
         _swix (DeviceFS_Deregister, _IN(0), udev->sc_devfs);
     dprintf (("", "deregistered driver %p\n", udev->sc_devfs));
     }
+   /* Cancel any pending callbacks attached to this device */
+   callx_remove_callback(announce_device,udev);
    free (udev);
    return 0;
 }
@@ -1953,6 +1965,8 @@ typedef struct device_valid {
     uint32_t    ep_type;
     uint32_t    timeout;
     uint32_t    size;
+    uint32_t    nopad;
+    uint32_t    shortflag;
 } device_valid;
 
 static void find_interface_and_endpoint
@@ -2073,7 +2087,10 @@ static _kernel_oserror* device_initialise
     str->report = valid->report;
 
     /* usb timeout, used for transfers */
-    str->timeout = valid->timeout;
+    str->timeout = (valid->timeout==0xdeaddead?0:valid->timeout);
+
+    /* New flags to work around deficencies in the DeviceFS interface */
+    str->flags = (valid->nopad?0:FLAG_NOPAD)|(valid->shortflag?0:FLAG_SHORT);
 
     /* see if an interface was specified, if not then look for the interface
        with the endpoint specified */
@@ -2301,7 +2318,7 @@ void start_write (struct devstream* str)
     {
 #ifdef DMA_FROM_BUFFER
         usbd_setup_xfer(str->xfer, str->pipe, str,
-            (void*) r.r[2], r.r[3], USBD_NO_COPY, 500, write_cb);
+            (void*) r.r[2], r.r[3], USBD_NO_COPY | (str->flags & FLAG_SHORT?USBD_FORCE_SHORT_XFER:0), 500, write_cb);
 #else
         usbd_setup_xfer(
             str->xfer,
@@ -2309,7 +2326,7 @@ void start_write (struct devstream* str)
             str,
             (void*) str->buffer_id,
             r.r[2],
-            0,
+            (str->flags & FLAG_SHORT?USBD_FORCE_SHORT_XFER:0),
             str->timeout,
             write_cb);
 
@@ -2357,47 +2374,39 @@ static void read_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
         return;
     }
 
+    if((str->flags & FLAG_NOPAD) || (str->count == str->totalcount))
+    {
+       /* Whatever happened, we're finished */
+       return;
+    }
     /* only start another transfer if we haven't finished the transfer and
        this is not a interrupt endpoint (the BSD framework restarts
        repeating transfers) */
     /* if we've got a number of bytes including a part packet, then
        transfer must have ended.. else.. try more */
-//    if(!xfer->pipe->repeat)
-//    {
-//      if(xfer->actlen < xfer->length)
-//      {
-//          char zero[ UGETW(xfer->pipe->endpoint->edesc->wMaxPacketSize)];
-//          memset (zero, 0, sizeof zero);
-//          /* fill up the rest of the request with garbage! */
-//          _kernel_swi_regs r;
-//          r.r[0] = BM_InsertBlock;
-//          r.r[1] = (int) str->buffer_id;
-//          r.r[2] = (int) zero;
-//          r.r[3] = str->totalcount - str->count;
-//          dprintf (("", "Fill insert %x bytes\n",r.r[3]));
-//          CallBufMan (&r);
-//      }
-//      else if (str->count != str->totalcount)
-//      {
-//          dprintf (("", "Starting read from callback\n"));
-//          start_read (str);
-//      }
-//    }
-
-    if ((xfer->actlen % UGETW(xfer->pipe->endpoint->edesc->wMaxPacketSize))
-        && str->count != str->totalcount)
+    if (xfer->actlen % UGETW(xfer->pipe->endpoint->edesc->wMaxPacketSize))
     {
+        /* required due to DeviceFS concept. */
         char zero[ UGETW(xfer->pipe->endpoint->edesc->wMaxPacketSize)];
+
+        /* Note difference for later correction by application */
+        int remain = str->padded_bytes = str->totalcount - str->count;
         memset (zero, 0, sizeof zero);
         /* fill up the rest of the request with garbage! */
         _kernel_swi_regs r;
         r.r[0] = BM_InsertBlock;
         r.r[1] = (int) str->buffer_id;
-        r.r[2] = (int) zero;
-        r.r[3] = str->totalcount - str->count;
-        CallBufMan (&r);
+        while(remain > 0)
+        {
+            r.r[2] = (int) zero;
+            r.r[3] = min(remain,UGETW(xfer->pipe->endpoint->edesc->wMaxPacketSize));
+            remain -= r.r[3];
+            CallBufMan (&r);
+            if(r.r[3])
+                break; /* Buffer was full - what do we do here? Try and insert the extra padding as more space becomes available? For now, just do what the old code did and give up */
+        }
     }
-    else if (str->count != str->totalcount && !xfer->pipe->repeat)
+    else if (!xfer->pipe->repeat)
     {
         dprintf (("", "Starting read from callback\n"));
         start_read (str);
@@ -2718,7 +2727,9 @@ _kernel_oserror* get_handles
     struct ugen_softc*  udev,
     int                 fs,
     int*                buf,
-    int*                dvfs
+    int*                dvfs,
+    struct devstream ** str,
+    devicefs_device**   sc_devfs
 )
 {
     int devfs;
@@ -2732,6 +2743,8 @@ _kernel_oserror* get_handles
         {
             if (dvfs) *dvfs = devfs;
             if (buf) *buf = udev->str[i]->buffer;
+            if (str) *str=udev->str[i];
+            if (sc_devfs) *sc_devfs=udev->sc_devfs;
             return NULL;
         }
     }
@@ -2798,6 +2811,53 @@ _kernel_oserror* clear_endpoint_stall
     return uerror (E_NoStream);
 }
 
+_kernel_oserror* get_transfer_info
+(
+    struct devstream*  str,
+    int*               count,
+    int*               totalcount,
+    int*               status,
+    int*               padded_buffer_bytes
+)
+{
+    if (!str) {
+      return uerror (E_NoStream);
+      }
+    *count=str->count;
+    *totalcount=str->totalcount;
+    switch(str->xfer->status) {
+      case USBD_NORMAL_COMPLETION: {
+        *status=1;
+        }
+      break;
+      case USBD_IN_PROGRESS: {
+        *status=0;
+        }
+      break;
+      default: {
+        *status=-1;
+        }
+      }
+    *padded_buffer_bytes=str->padded_bytes;
+    return NULL;
+}
+
+_kernel_oserror* getset_options
+(
+    struct devstream*  str,
+    int*               eor,
+    int*               and
+)
+{
+    if (!str) {
+      return uerror (E_NoStream);
+      }
+    int new = ((str->flags & *and) ^ *eor) & FLAG_VALIDMASK;
+    *eor = str->flags;
+    str->flags = *and = new;
+    return NULL;
+}
+
 /*---------------------------------------------------------------------------*/
 
 _kernel_oserror* driver (_kernel_swi_regs* r, void* pw)
@@ -2848,6 +2908,7 @@ _kernel_oserror* driver (_kernel_swi_regs* r, void* pw)
         break;
     case DeviceFSCallDevice_RxWakeUp:
         str->count = 0;
+        str->padded_bytes=0;
         /* total length has always been passed in R3, although not documented */
         str->totalcount = r->r[3];
         dprintf (("main", "wakeup read, resetting count to %d, totalcount to %d\n",
@@ -2963,7 +3024,7 @@ _kernel_oserror* driver (_kernel_swi_regs* r, void* pw)
         return get_buffer_space (udev, r->r[2], r->r + 3, r->r + 4);
         break;
     case DeviceFSCallDevice_GetHandles:
-        return get_handles (udev, r->r[2], r->r + 3, r->r + 4);
+        return get_handles (udev, r->r[2], r->r + 3, r->r + 4, NULL, NULL);
         break;
     case DeviceFSCallDevice_GetLocation:
         return get_location (udev, (char*) r->r[3]);
@@ -2971,10 +3032,18 @@ _kernel_oserror* driver (_kernel_swi_regs* r, void* pw)
     case DeviceFSCallDevice_ClearStall:
         return clear_endpoint_stall (udev, r->r[2]);
         break;
+    case DeviceFSCallDevice_TransferInfo:
+        return get_transfer_info (str, r->r + 0, r->r + 1, r->r + 3, r->r + 4);
+        break;
+    case DeviceFSCallDevice_GetHandles2:
+        return get_handles (udev, r->r[2], r->r + 3, r->r + 4, (struct devstream **) ((int *) r->r + 5), (devicefs_device**) ((int *) r->r + 6));
+        break;
+    case DeviceFSCallDevice_GetSetOptions:
+        return getset_options (str, r->r + 3, r->r + 4);
+        break;
     }
 
     return NULL;
 }
 
 /*--------------------------------------------------------------------------*/
-

build/cmhg/ehcimodhead

@@ -29,9 +29,7 @@ help-string:	     	EHCIDriver  EHCIDriverModule_MajorVersion_CMHG
 
 date-string:	    	EHCIDriverModule_Module_Date_CMHG
 
-#define HELPFILE(M) "Resources:$." #M
-#define XHELPFILE(M) HELPFILE(M)
-international-help-file: XHELPFILE(MSGLOC)
+international-help-file: "Resources:$.Resources.EHCIDriver.Messages"
 
 #ifdef EHCI_DEBUG
 command-keyword-table:	module_commands

build/cmhg/ohcimodhead

@@ -32,9 +32,7 @@ help-string:	     	OHCIDriver  OHCIDriverModule_MajorVersion_CMHG
 
 date-string:	    	OHCIDriverModule_Module_Date_CMHG
 
-#define HELPFILE(M) "Resources:$." #M
-#define XHELPFILE(M) HELPFILE(M)
-international-help-file: XHELPFILE(MSGLOC)
+international-help-file: "Resources:$.Resources.OHCIDriver.Messages"
 
 #ifdef OHCI_DEBUG
 command-keyword-table:	module_commands

build/cmhg/usbmodhead

@@ -31,9 +31,7 @@ help-string:	     	USBDriver  USBDriverModule_MajorVersion_CMHG
 
 date-string:	    	USBDriverModule_Module_Date_CMHG
 
-#define HELPFILE(M) "Resources:$." #M
-#define XHELPFILE(M) HELPFILE(M)
-international-help-file: XHELPFILE(MSGLOC)
+international-help-file: "Resources:$.Resources.USBDriver.Messages"
 
 command-keyword-table:	module_commands
 
@@ -80,43 +78,8 @@ swi-decoding-table: 	USBDriver,
                         DeRegisterBus,
                         InsertTransfer,
                         TransferComplete,
-                        ScheduleSoftInterrupt
-;                        IOCtl,
-;                        OpenPipe,
-;                        ClosePipe,
-;                        Transfer,
-;                        AllocXfer,
-;                        FreeXfer,
-;                        SetupXfer,
-;                        SetupDefaultXfer,
-;                        SetupIsocXfer,
-;                        GetXferStatus,
-;                        Interface2EndpointDescriptor,
-;                        AbortPipe,
-;                        ClearEndpointStall,
-;                        ClearEndpointStallAsync,
-;                        EndpointCount,
-;                        Interface2DeviceHandle,
-;                        Device2InterfaceHandle,
-;                        Pipe2DeviceHandle,
-;                        AllocBuffer,
-;                        Freebuffer,
-;                        GetBuffer,
-;                        SyncTransfer,
-;                        OpenPipeIntr,
-;                        DoRequest,
-;                        DoRequestAsync,
-;                        DoRequestFlags,
-;                        GetInterfaceDescriptor,
-;                        GetConfigDescriptor,
-;                        SetInterface,
-;                        FillDeviceInfo,
-;                        GetInterfaceAltindex,
-;                        FindIdesc,
-;                        FindEdesc,
-;                        DevInfo,
-;                        GetEndpointDescriptor,
-;                        ReloadDeviceDesc
+                        ScheduleSoftInterrupt,
+                        Version
 
 
 generic-veneers:        driver_entry/driver