From a57c5c43cafd0351b783ea83de03224a4996e02b Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Fri, 25 Aug 2000 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2000-08-25 --- boot/key.c | 12 ++++++++++++ pc/etherec2t.c | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/boot/key.c b/boot/key.c index f78db141a1fea56cee934b03b0e1e1e6c5990154..097cc160b25d8c78c60a4332e063b110045c7e1d 100644 --- a/boot/key.c +++ b/boot/key.c @@ -39,6 +39,18 @@ key(int islocal, Method *mp) safeoff = 1024+850; } else if(strcmp(cputype, "386") == 0 || strcmp(cputype, "alpha") == 0){ fd = open("#S/sdC0/nvram", ORDWR); + if(fd < 0){ + fd = open("#S/sdC0/9fat", ORDWR); + if(fd >= 0){ + safeoff = finddosfile(fd, "plan9.nvr"); + if(safeoff < 0){ + close(fd); + fd = -1; + } +print("safeoff = %d\n", safeoff); + safelen = 512; + } + } if(fd < 0) fd = open("#S/sd00/nvram", ORDWR); if(fd < 0){ diff --git a/pc/etherec2t.c b/pc/etherec2t.c index c4f7689c20647c8310d87c5780fe228ecf6aa541..994b2f6181cf9d5c4b5d55c154e72148784d0209 100644 --- a/pc/etherec2t.c +++ b/pc/etherec2t.c @@ -22,6 +22,7 @@ static char* ec2tpcmcia[] = { "EC2T", /* Linksys Combo PCMCIA EthernetCard */ "PCMPC100", /* EtherFast 10/100 PC Card */ "EN2216", /* Accton EtherPair-PCMCIA */ + "FA410TX", /* Netgear FA410TX */ nil, }; @@ -115,7 +116,7 @@ reset(Ether* ether) */ dp8390reset(ether); sum = 0; - if(cistrcmp(type, "PCMPC100") == 0){ + if(cistrcmp(type, "PCMPC100") == 0 || cistrcmp(type, "FA410TX") == 0){ /* * The PCMPC100 has the ethernet address in I/O space. * There's a checksum over 8 bytes which sums to 0xFF.