Subject: Re: Socket Comm. LP-E problem
To: Jun Ebihara <jun@soum.co.jp>
From: Todd Whitesel <toddpw@best.com>
List: port-hpcmips
Date: 10/23/2000 23:54:59
> > Low Power Ethernet LAN Adapter, Scoket Communications, Inc, Revision A,
> > 09/30/97 (manufacturer 0x0104, product 0x000d) function 0 not configured
I have one of these and built a kernel that can use it; they were in my z50
at BSDcon last week. However I had a power failure and lost the diffs before
I was able to commit them (long story, it wasn't NetBSD's fault though).
Okay, I just did a checkout and applied what I remember of the diffs. I did
not build a new kernel though. Could somebody look these over and tell me if
there is anything obviously wrong with them? Otherwise they should be fine.
(BTW I also fixed a "SOCEKT" typo in the CF card data.)
Index: if_ne_pcmcia.c
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/pcmcia/if_ne_pcmcia.c,v
retrieving revision 1.63
diff -u -r1.63 if_ne_pcmcia.c
--- if_ne_pcmcia.c 2000/10/17 01:50:40 1.63
+++ if_ne_pcmcia.c 2000/10/24 06:52:52
@@ -314,9 +314,14 @@
PCMCIA_CIS_SMC_EZCARD,
0, 0x01c0, { 0x00, 0xe0, 0x29 } },
- { PCMCIA_STR_SOCEKT_LP_ETHER_CF,
- PCMCIA_VENDOR_SOCKET, PCMCIA_PRODUCT_SOCEKT_LP_ETHER_CF,
- PCMCIA_CIS_SOCEKT_LP_ETHER_CF,
+ { PCMCIA_STR_SOCKET_LP_ETHER_CF,
+ PCMCIA_VENDOR_SOCKET, PCMCIA_PRODUCT_SOCKET_LP_ETHER_CF,
+ PCMCIA_CIS_SOCKET_LP_ETHER_CF,
+ 0, -1, { 0x00, 0xc0, 0x1b } },
+
+ { PCMCIA_STR_SOCKET_LP_ETHER,
+ PCMCIA_VENDOR_SOCKET, PCMCIA_PRODUCT_SOCKET_LP_ETHER,
+ PCMCIA_CIS_SOCKET_LP_ETHER,
0, -1, { 0x00, 0xc0, 0x1b } },
{ PCMCIA_STR_XIRCOM_CFE_10,
Index: pcmciadevs
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/pcmcia/pcmciadevs,v
retrieving revision 1.98
diff -u -r1.98 pcmciadevs
--- pcmciadevs 2000/08/24 07:10:36 1.98
+++ pcmciadevs 2000/10/24 06:52:52
@@ -188,7 +188,8 @@
/* Socket Communications Products */
product SOCKET PAGECARD 0x0003 Socket Communications PageCard
product SOCKET DUAL_RS232 0x0006 Socket Communications Dual RS232
-product SOCEKT LP_ETHER_CF 0x0075 Socket Communications Low Power Ethernet CF
+product SOCKET LP_ETHER_CF 0x0075 Socket Communications Low Power Ethernet CF
+product SOCKET LP_ETHER 0x000d Socket Communications Low Power Ethernet
/* TDK Products */
product TDK LAK_CD021BX 0x0200 TDK LAK-CD021BX Ethernet
Index: pcmciadevs.h
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/pcmcia/pcmciadevs.h,v
retrieving revision 1.97
diff -u -r1.97 pcmciadevs.h
--- pcmciadevs.h 2000/08/24 07:12:20 1.97
+++ pcmciadevs.h 2000/10/24 06:52:53
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciadevs.h,v 1.97 2000/08/24 07:12:20 imp Exp $ */
+/* $NetBSD$ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -303,9 +303,12 @@
#define PCMCIA_CIS_SOCKET_DUAL_RS232 { NULL, NULL, NULL, NULL }
#define PCMCIA_PRODUCT_SOCKET_DUAL_RS232 0x0006
#define PCMCIA_STR_SOCKET_DUAL_RS232 "Socket Communications Dual RS232"
-#define PCMCIA_CIS_SOCEKT_LP_ETHER_CF { NULL, NULL, NULL, NULL }
-#define PCMCIA_PRODUCT_SOCEKT_LP_ETHER_CF 0x0075
-#define PCMCIA_STR_SOCEKT_LP_ETHER_CF "Socket Communications Low Power Ethernet CF"
+#define PCMCIA_CIS_SOCKET_LP_ETHER_CF { NULL, NULL, NULL, NULL }
+#define PCMCIA_PRODUCT_SOCKET_LP_ETHER_CF 0x0075
+#define PCMCIA_STR_SOCKET_LP_ETHER_CF "Socket Communications Low Power Ethernet CF"
+#define PCMCIA_CIS_SOCKET_LP_ETHER { NULL, NULL, NULL, NULL }
+#define PCMCIA_PRODUCT_SOCKET_LP_ETHER 0x000d
+#define PCMCIA_STR_SOCKET_LP_ETHER "Socket Communications Low Power Ethernet"
/* TDK Products */
#define PCMCIA_CIS_TDK_LAK_CD021BX { NULL, NULL, NULL, NULL }
Index: pcmciadevs_data.h
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/pcmcia/pcmciadevs_data.h,v
retrieving revision 1.97
diff -u -r1.97 pcmciadevs_data.h
--- pcmciadevs_data.h 2000/08/24 07:12:20 1.97
+++ pcmciadevs_data.h 2000/10/24 06:52:53
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciadevs_data.h,v 1.97 2000/08/24 07:12:20 imp Exp $ */
+/* $NetBSD$ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -423,11 +423,18 @@
"Socket Communications Dual RS232" },
},
{
- PCMCIA_VENDOR_SOCEKT, PCMCIA_PRODUCT_SOCEKT_LP_ETHER_CF,
- PCMCIA_CIS_SOCEKT_LP_ETHER_CF,
+ PCMCIA_VENDOR_SOCKET, PCMCIA_PRODUCT_SOCKET_LP_ETHER_CF,
+ PCMCIA_CIS_SOCKET_LP_ETHER_CF,
0,
- "",
+ "Socket Communications",
"Socket Communications Low Power Ethernet CF" },
+ },
+ {
+ PCMCIA_VENDOR_SOCKET, PCMCIA_PRODUCT_SOCKET_LP_ETHER,
+ PCMCIA_CIS_SOCKET_LP_ETHER,
+ 0,
+ "Socket Communications",
+ "Socket Communications Low Power Ethernet" },
},
{
PCMCIA_VENDOR_TDK, PCMCIA_PRODUCT_TDK_LAK_CD021BX,
# eof
Todd Whitesel
toddpw @ best.com