Date: Fri, 21 Jan 2000 17:58:27 +0900 From: Tatsumi Hosokawa <hosokawa@itc.keio.ac.jp> To: imp@village.org Cc: mobile@FreeBSD.ORG Subject: Re: if_sn now works on -current (Re: One more serious problem with -current PCCARD support ) Message-ID: <86embbrebw.wl@ringo.FromTo.Cc> In-Reply-To: In your message of "Fri, 21 Jan 2000 01:01:02 -0700" <200001210801.BAA09842@harmony.village.org> References: <863drs1vdr.wl@ringo.FromTo.Cc> <86r9fisfe2.wl@ringo.FromTo.Cc> <86u2kesizg.wl@ringo.FromTo.Cc> <200001180742.AAA15379@harmony.village.org> <864sc820u4.wl@ringo.FromTo.Cc> <200001210801.BAA09842@harmony.village.org>
next in thread | previous in thread | raw e-mail | index | archive | help
At Fri, 21 Jan 2000 01:01:02 -0700,
Warner Losh <imp@village.org> wrote:
> : This patch adds "attr2" keyword to /etc/pccard.conf and I'm afraid
> : that it can break feature freeze. If it's not acceptable, I'll commit
> : it later.
>
> That is fine by me. When you commit this, you may want to add that I
> said it was OK.
Thank you.
> : Index: sys/dev/sn/if_sn_pccard.c
>
> I think you missed the kludge I have in if_sn.c:
Oops. I rewrote it.
Index: if_sn.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sn/if_sn.c,v
retrieving revision 1.5
diff -u -r1.5 if_sn.c
--- if_sn.c 1999/12/28 01:07:15 1.5
+++ if_sn.c 2000/01/21 08:57:06
@@ -148,9 +148,6 @@
*/
#define SW_PAD
-/* XXX KLUDGE XXX */
-u_char sn_pccard_macaddr[6] = { 0x00, 0x00, 0x86, 0x10, 0x2b, 0xc0 };
-
static const char *chip_ids[15] = {
NULL, NULL, NULL,
/* 3 */ "SMC91C90/91C92",
@@ -173,6 +170,7 @@
struct sockaddr_dl *sdl;
int rev;
u_short address;
+ int j;
sn_activate(dev);
@@ -191,19 +189,13 @@
SMC_SELECT_BANK(1);
i = inw(BASE + CONFIG_REG_W);
printf(i & CR_AUI_SELECT ? "AUI" : "UTP");
+
+ for (j = 0; j < 3; j++) {
+ u_short w;
- if (1) {
- /* XXX The pccard probe routine for megahearts needs to */
- /* XXX snag this from your info 2 */
- int j;
-
- for (j = 0; j < 3; j++) {
- u_short w;
-
- w = (u_short)sn_pccard_macaddr[j * 2] |
- (((u_short)sn_pccard_macaddr[j * 2 + 1]) << 8);
- outw(BASE + IAR_ADDR0_REG_W + j * 2, w);
- }
+ w = (u_short)sc->arpcom.ac_enaddr[j * 2] |
+ (((u_short)sc->arpcom.ac_enaddr[j * 2 + 1]) << 8);
+ outw(BASE + IAR_ADDR0_REG_W + j * 2, w);
}
/*
--
---------------------------
Tatsumi Hosokawa
hosokawa@itc.keio.ac.jp
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-mobile" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86embbrebw.wl>