ubsa at usbifif or usbdevif?

[Frank Wille <frank%phoenix.owl.de@localhost>]

Hi,

I would like to revert some modifications of ichiro in dev/usb/files.usb,
to fix the ubsa driver:

--- CVS/Base/files.usb  2008-06-28 14:09:59.000000000 +0200
+++ files.usb   2008-07-12 20:28:51.000000000 +0200
@@ -237,8 +237,8 @@
 define ubsa_common
 file   dev/usb/ubsa_common.c           ubsa_common
 device ubsa: ucombus, ubsa_common
-#attach        ubsa at usbdevif
-attach ubsa at usbifif
+attach ubsa at usbdevif
+#attach        ubsa at usbifif
 file   dev/usb/ubsa.c                  ubsa
 
 # Huawei E220 3G/HSDPA modem (ubsa)


Further on I think that I need to fix this:

--- usb/CVS/Base/ubsavar.h      2008-06-28 14:09:59.000000000 +0200
+++ usb/ubsavar.h       2008-07-11 20:55:12.000000000 +0200
@@ -55,7 +55,7 @@
 
 #define        UBSA_MODVER             1       /* module version */
 
-#define        UBSA_DEFAULT_CONFIG_INDEX       1
+#define        UBSA_DEFAULT_CONFIG_INDEX       0
 #define        UBSA_IFACE_INDEX_OFFSET 0
 
 #define        UBSA_INTR_INTERVAL      100     /* ms */
--- usb/CVS/Base/usb_subr.c     2008-06-28 14:10:00.000000000 +0200
+++ usb/usb_subr.c      2008-07-11 20:53:39.000000000 +0200
@@ -555,7 +555,7 @@
        DPRINTFN(5,("usbd_set_config_index: dev=%p index=%d\n", dev, index));
 
        if (index >= dev->ddesc.bNumConfigurations &&
-           index != USB_UNCONFIG_NO) {
+           index != USB_UNCONFIG_INDEX) {
                /* panic? */
                printf("usbd_set_config_index: illegal index\n");
                return (USBD_INVAL);


Unfortunately I cannot reach Ichiro by mail since several days to ask him
about it. Can anybody with USB/cardbus knowledge please comment on that?

By applying the above patches, although I don't know whether they are correct,
I got a working ucom0 device for my Option N.V. MC3G again.

-- 
Frank Wille