diff options
| author | imp <imp@FreeBSD.org> | 2003-11-03 16:04:31 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-11-03 16:04:31 +0000 |
| commit | 4bbd8335fced913b53cf977607397c95aeefdb36 (patch) | |
| tree | 38f164de8f636d42cd66188d674f1d0501e101c3 /sys/dev/pccard | |
| parent | c3859de0f22ef34def77814f30c78bcdff3cbccb (diff) | |
| download | FreeBSD-src-4bbd8335fced913b53cf977607397c95aeefdb36.zip FreeBSD-src-4bbd8335fced913b53cf977607397c95aeefdb36.tar.gz | |
o Use %j and uintmax_t rather than uint64_t for casting.
o use more proper bus_size_t for iosize rather than bus_addr_t.
Noticed by: bde
Diffstat (limited to 'sys/dev/pccard')
| -rw-r--r-- | sys/dev/pccard/pccard.c | 7 | ||||
| -rw-r--r-- | sys/dev/pccard/pccarddevs | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index 4eaf8de..94e0292 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -533,8 +533,7 @@ static void pccard_mfc_adjust_iobase(struct pccard_function *pf, bus_addr_t addr, bus_addr_t offset, bus_size_t size) { - bus_addr_t iosize; - bus_size_t tmp; + bus_size_t iosize, tmp; if (addr != 0) { if (pf->pf_mfc_iomax == 0) { @@ -555,8 +554,8 @@ pccard_mfc_adjust_iobase(struct pccard_function *pf, bus_addr_t addr, ; iosize--; - DEVPRINTF((pf->dev, "MFC: I/O base 0x%llx IOSIZE %lld\n", - (uint64_t) pf->pf_mfc_iobase, (uint64_t) iosize)); + DEVPRINTF((pf->dev, "MFC: I/O base 0x%jx IOSIZE %jd\n", + (uintmax_t) pf->pf_mfc_iobase, (uintmax_t) iosize)); pccard_ccr_write(pf, PCCARD_CCR_IOBASE0, pf->pf_mfc_iobase & 0xff); pccard_ccr_write(pf, PCCARD_CCR_IOBASE1, diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs index 5872c5c..f1f74a4 100644 --- a/sys/dev/pccard/pccarddevs +++ b/sys/dev/pccard/pccarddevs @@ -279,6 +279,7 @@ product IBM ETHERJET 0x003f IBM EtherJet Ethernet /* Intel Products */ product INTEL PRO_WLAN_2011 0x0001 Intel PRO/Wireless 2011 LAN PC Card product INTEL EEPRO100 0x010a Intel EtherExpress PRO/100 +product INTEL ETHEREXP 0x0301 Intel EtherExpress PCMCIA Card /* Intersil */ /* Note: The following likely is an OEM card under a different Intersil name */ |
