--LZvS9be/3tNcYl/X
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Jan Schaumann <jschauma@netbsd.org> wrote:

> GENERIC_LAPTOP detects my Megahertz XK3288 modem/ethernet card at
> pcmcia, function 0, but reports it as 'not configured'.  Any insights?

The attached changes get it to be recognized, but it doesn't seem to be
working.  I'll have to poke around there a bit more, this message just
being an FYI in acse somebody else wants to work on this as well.

-Jan

-- 
Probability factor of one to one. We have normality. I repeat, we have 
normality. Anything you still can't cope with is therefore your own lookout.

--LZvS9be/3tNcYl/X
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="megahertz.diff"

Index: mhzc.c
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/pcmcia/mhzc.c,v
retrieving revision 1.8
diff -b -u -r1.8 mhzc.c
--- mhzc.c	2001/11/13 07:26:34	1.8
+++ mhzc.c	2002/10/02 22:44:58
@@ -161,6 +161,10 @@
 	{ { PCMCIA_STR_MEGAHERTZ_XJEM3336,	PCMCIA_VENDOR_MEGAHERTZ,
 	    PCMCIA_PRODUCT_MEGAHERTZ_XJEM3336,	0 },
 	  mhzc_em3336_enaddr,		mhzc_em3336_enable },
+
+	{ { PCMCIA_STR_MEGAHERTZ_XJ3288,      PCMCIA_VENDOR_MEGAHERTZ,
+	     PCMCIA_PRODUCT_MEGAHERTZ_XJ3288, 0 },
+	  mhzc_em3336_enaddr,		mhzc_em3336_enable},
 
 	/*
 	 * Eventually we could add support for other Ethernet/Modem
Index: pcmciadevs
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/pcmcia/pcmciadevs,v
retrieving revision 1.167.4.5
diff -b -u -r1.167.4.5 pcmciadevs
--- pcmciadevs	2002/09/18 19:37:19	1.167.4.5
+++ pcmciadevs	2002/10/02 22:44:58
@@ -251,6 +251,7 @@
 
 /* Megahertz Products */
 product MEGAHERTZ XJEM3336 	0x0006 Megahertz X-JACK Ethernet Modem
+product MEGAHERTZ XJ3288	0x0008 Megahertz XJ3288 Ethernet Modem
 product MEGAHERTZ XJ4288	0x0023 Megahertz XJ4288 Modem
 product MEGAHERTZ XJ4336	0x0027 Megahertz XJ4336 Modem
 product MEGAHERTZ XJ5560	0x0034 Megahertz X-JACK 56kbps Modem
Index: pcmciadevs.h
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/pcmcia/pcmciadevs.h,v
retrieving revision 1.167.4.5
diff -b -u -r1.167.4.5 pcmciadevs.h
--- pcmciadevs.h	2002/09/18 19:37:42	1.167.4.5
+++ pcmciadevs.h	2002/10/02 22:44:59
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcmciadevs.h,v 1.167.4.5 2002/09/18 19:37:42 thorpej Exp $	*/
+/*	$NetBSD$	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -410,6 +410,9 @@
 #define	PCMCIA_CIS_MEGAHERTZ_XJEM3336	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ_XJEM3336	0x0006
 #define	PCMCIA_STR_MEGAHERTZ_XJEM3336	"Megahertz X-JACK Ethernet Modem"
+#define	PCMCIA_CIS_MEGAHERTZ_XJ3288	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MEGAHERTZ_XJ3288	0x0008
+#define	PCMCIA_STR_MEGAHERTZ_XJ3288	"Megahertz XJ3288 Ethernet Modem"
 #define	PCMCIA_CIS_MEGAHERTZ_XJ4288	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ_XJ4288	0x0023
 #define	PCMCIA_STR_MEGAHERTZ_XJ4288	"Megahertz XJ4288 Modem"
Index: pcmciadevs_data.h
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/pcmcia/pcmciadevs_data.h,v
retrieving revision 1.167.4.5
diff -b -u -r1.167.4.5 pcmciadevs_data.h
--- pcmciadevs_data.h	2002/09/18 19:37:44	1.167.4.5
+++ pcmciadevs_data.h	2002/10/02 22:45:00
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcmciadevs_data.h,v 1.167.4.5 2002/09/18 19:37:44 thorpej Exp $	*/
+/*	$NetBSD$	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -594,6 +594,13 @@
 	    0,
 	    "Megahertz Corporation",
 	    "Megahertz X-JACK Ethernet Modem",	}
+	,
+	{
+	    PCMCIA_VENDOR_MEGAHERTZ, PCMCIA_PRODUCT_MEGAHERTZ_XJ3288,
+	    PCMCIA_CIS_MEGAHERTZ_XJ3288,
+	    0,
+	    "Megahertz Corporation",
+	    "Megahertz XJ3288 Ethernet Modem",	}
 	,
 	{
 	    PCMCIA_VENDOR_MEGAHERTZ, PCMCIA_PRODUCT_MEGAHERTZ_XJ4288,

--LZvS9be/3tNcYl/X--