diff options
| author | imp <imp@FreeBSD.org> | 2008-08-07 20:52:54 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2008-08-07 20:52:54 +0000 |
| commit | 1fbadc47e92419f3c5765760b8fd716a5acdcc83 (patch) | |
| tree | 31f6a51ff73b59a5641094cf41ced365f4f9cef7 | |
| parent | f05570f4d0a6fd049460f901b8f8793c2803262b (diff) | |
| download | FreeBSD-src-1fbadc47e92419f3c5765760b8fd716a5acdcc83.zip FreeBSD-src-1fbadc47e92419f3c5765760b8fd716a5acdcc83.tar.gz | |
Add NEC PC-9802N-J02 (confirmed) and NEC PC-9202N-J02R (speculative)
to the list of devices.
| -rw-r--r-- | sys/dev/pccard/pccard.c | 20 | ||||
| -rw-r--r-- | sys/dev/pccard/pccarddevs | 2 |
2 files changed, 5 insertions, 17 deletions
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index daddf56..9aa3a0b 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -654,18 +654,9 @@ pccard_function_enable(struct pccard_function *pf) return (ENOMEM); } - /* - * Increase the reference count on the socket, enabling power, if - * necessary. XXX: I don't see the enable power part here! - */ - pf->sc->sc_enabled_count++; - - if (pf->pf_flags & PFF_ENABLED) { - /* - * Don't do anything if we're already enabled. - */ + if (pf->pf_flags & PFF_ENABLED) return (0); - } + pf->sc->sc_enabled_count++; /* * it's possible for different functions' CCRs to be in the same @@ -775,13 +766,8 @@ pccard_function_disable(struct pccard_function *pf) if (pf->cfe == NULL) panic("pccard_function_disable: function not initialized"); - if ((pf->pf_flags & PFF_ENABLED) == 0) { - /* - * Don't do anything if we're already disabled. - */ + if ((pf->pf_flags & PFF_ENABLED) == 0) return; - } - if (pf->intr_handler != NULL) { struct pccard_ivar *devi = PCCARD_IVAR(pf->dev); struct resource_list_entry *rle = diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs index e0abab7..9a660fe 100644 --- a/sys/dev/pccard/pccarddevs +++ b/sys/dev/pccard/pccarddevs @@ -735,6 +735,8 @@ product MICRORESEARCH MR10TPC { "MICRO-RESEARCH-MR10TPC", "Ethernet", NULL, NULL product NANOSPEED PRISM2 { "NANOSPEED", "HFA384x/IEEE", "Version&sp01.02", NULL } NANOSPEED ROOT-RZ2000 WLAN Card product NDC ND5100_E { "NDC", "Ethernet", "A", NULL } Sohoware ND5100E NE2000 Compatible Card product NEC CMZ_RT_WP { "NEC", "Wireless&spCard&spCMZ-RT-WP", "Version&sp01.01", NULL } NEC Wireless Card CMZ-RT-WP +product NEC PC9801N_J02 { "NEC", "\021\001\001PC-9801N-J02", NULL, NULL } NEC PC-9801N-J02 +product NEC PC9801N_J02R { "NEC", "PC-9801N-J02R", NULL, NULL } NEC PC-9801N-J02R product NEC PC9801N_J03R { "NEC", "PC-9801N-J03R", NULL, NULL } NEC PC-9801N-J03R product NEWMEDIA BASICS_SCSI { "BASICS&spby&spNew&spMedia&spCorporation", "SCSI&spSym53C500", NULL, NULL } New Media Corporation BASICS SCSI product NTT_ME WLAN { "NTT-ME", "11Mbps&spWireless&spLAN&spPC&spCard", NULL, NULL } NTT-ME 11Mbps Wireless LAN PC Card |
