diff options
Diffstat (limited to 'mdk-stage1/pcmcia_')
| -rw-r--r-- | mdk-stage1/pcmcia_/Makefile | 17 | ||||
| -rw-r--r-- | mdk-stage1/pcmcia_/cardmgr.c | 6 | ||||
| -rwxr-xr-x | mdk-stage1/pcmcia_/merge_from_pcitable | 6 | ||||
| -rw-r--r-- | mdk-stage1/pcmcia_/probe.c | 9 |
4 files changed, 18 insertions, 20 deletions
diff --git a/mdk-stage1/pcmcia_/Makefile b/mdk-stage1/pcmcia_/Makefile index bb3b0257e..b247b1397 100644 --- a/mdk-stage1/pcmcia_/Makefile +++ b/mdk-stage1/pcmcia_/Makefile @@ -18,31 +18,20 @@ top_dir = .. include $(top_dir)/Makefile.common -all: libpcmcia.a libpcmcia-DIET.a +all: libpcmcia.a clean: rm -f *.o libpcmcia.a -FLAGS = -D__linux__ -Wall -Werror -Os -fomit-frame-pointer -pipe -c -I.. +FLAGS = -D__linux__ -Wall -Werror -Os -fomit-frame-pointer -pipe -c -I.. -D_BSD_SOURCE OBJS = probe.o cardmgr.o lex_config.o yacc_config.o -OBJS-DIET = $(subst .o,-DIET.o,$(OBJS)) - libpcmcia.a: $(OBJS) ar -cru $@ $^ ranlib $@ -libpcmcia-DIET.a: $(OBJS-DIET) - ar -cru $@ $^ - ranlib $@ - - $(OBJS): %.o: %.c - gcc $(FLAGS) $(GLIBC_INCLUDES) -c $< -o $@ - -$(OBJS-DIET): %-DIET.o: %.c - gcc $(FLAGS) $(DIETLIBC_INCLUDES) -c $< -o $@ - + $(DIET) gcc $(FLAGS) $(INCLUDES) -c $< -o $@ diff --git a/mdk-stage1/pcmcia_/cardmgr.c b/mdk-stage1/pcmcia_/cardmgr.c index 1db18b55b..ea3ff127e 100644 --- a/mdk-stage1/pcmcia_/cardmgr.c +++ b/mdk-stage1/pcmcia_/cardmgr.c @@ -1259,9 +1259,9 @@ static void adjust_resources(void) if (ret != 0) { switch (al->adj.Resource) { case RES_MEMORY_RANGE: - sprintf(tmp, "memory %#lx-%#lx", - al->adj.resource.memory.Base, - al->adj.resource.memory.Base + + sprintf(tmp, "memory %p-%p", + (char *)al->adj.resource.memory.Base, + (char *)al->adj.resource.memory.Base + al->adj.resource.memory.Size - 1); break; case RES_IO_RANGE: diff --git a/mdk-stage1/pcmcia_/merge_from_pcitable b/mdk-stage1/pcmcia_/merge_from_pcitable index 74fc56f31..27cda239b 100755 --- a/mdk-stage1/pcmcia_/merge_from_pcitable +++ b/mdk-stage1/pcmcia_/merge_from_pcitable @@ -41,9 +41,9 @@ print "Missing in pcitable:\n"; foreach my $p (@probes) { my @r = grep { $_->{vd} eq $p->{vd} } @pcitable; @r > 1 and die "duplicate entry in pcitable <$p->{vd}>\n"; - if (@r && $r[0]->{driver} ne 'yenta_socket') { - push @res, "0x$p->{vendor}\t0x$p->{device}\t\"yenta_socket\"\t\"$r[0]->{name}\"\n"; - $r[0]->{driver} ne 'unknown' and print STDERR "WARNING, driver for <$p->{vd}> was <$r[0]->{driver}>\n"; + if (!@r || @r && $r[0]->{driver} ne 'yenta_socket') { + push @res, "0x$p->{vendor}\t0x$p->{device}\t\"yenta_socket\"\t\"" . (@r ? $r[0]->{name} : '(COMPLETELY MISSING)') . "\"\n"; + @r and $r[0]->{driver} ne 'unknown' and print STDERR "WARNING, driver for <$p->{vd}> was <$r[0]->{driver}>\n"; } } print sort @res; diff --git a/mdk-stage1/pcmcia_/probe.c b/mdk-stage1/pcmcia_/probe.c index 7a61d2f62..88853426d 100644 --- a/mdk-stage1/pcmcia_/probe.c +++ b/mdk-stage1/pcmcia_/probe.c @@ -94,9 +94,17 @@ pci_id_t pci_id[] = { { 0x104c, 0xac51, "yenta_socket", "Texas Instruments PCI1420" }, { 0x104c, 0xac1b, "yenta_socket", "Texas Instruments PCI1450" }, { 0x104c, 0xac52, "yenta_socket", "Texas Instruments PCI1451" }, + { 0x104c, 0xac56, "yenta_socket", "Texas Instruments PCI1510" }, + { 0x104c, 0xac55, "yenta_socket", "Texas Instruments PCI1520" }, + { 0x104c, 0xac54, "yenta_socket", "Texas Instruments PCI1620" }, { 0x104c, 0xac41, "yenta_socket", "Texas Instruments PCI4410" }, { 0x104c, 0xac40, "yenta_socket", "Texas Instruments PCI4450" }, { 0x104c, 0xac42, "yenta_socket", "Texas Instruments PCI4451" }, + { 0x104c, 0xac44, "yenta_socket", "Texas Instruments PCI4510" }, + { 0x104c, 0xac46, "yenta_socket", "Texas Instruments PCI4520" }, + { 0x104c, 0xac49, "yenta_socket", "Texas Instruments PCI7410" }, + { 0x104c, 0xac47, "yenta_socket", "Texas Instruments PCI7510" }, + { 0x104c, 0xac48, "yenta_socket", "Texas Instruments PCI7610" }, { 0x1217, 0x6729, "i82365", "O2 Micro 6729" }, { 0x1217, 0x673a, "i82365", "O2 Micro 6730" }, { 0x1217, 0x6832, "yenta_socket", "O2 Micro 6832/6833" }, @@ -110,6 +118,7 @@ pci_id_t pci_id[] = { { 0x1179, 0x060f, "yenta_socket", "Toshiba ToPIC97" }, { 0x1179, 0x0617, "yenta_socket", "Toshiba ToPIC100" }, { 0x119b, 0x1221, "i82365", "Omega Micro 82C092G" }, + { 0x1524, 0x1411, "yenta_socket", "ENE Technology CB1411" }, { 0x8086, 0x1221, "i82092", "Intel 82092AA_0" }, { 0x8086, 0x1222, "i82092", "Intel 82092AA_1" }, }; |