CVS commit: src/sys/dev/pcmcia
Module Name:src
Committed By: riastradh
Date: Wed May 10 00:12:20 UTC 2023
Modified Files:
src/sys/dev/pcmcia: xirc.c
Log Message:
xirc(4): Use config_detach_children.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pcmcia/xirc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/xirc.c
diff -u src/sys/dev/pcmcia/xirc.c:1.38 src/sys/dev/pcmcia/xirc.c:1.39
--- src/sys/dev/pcmcia/xirc.c:1.38 Sat Aug 7 16:19:15 2021
+++ src/sys/dev/pcmcia/xirc.c Wed May 10 00:12:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: xirc.c,v 1.38 2021/08/07 16:19:15 thorpej Exp $ */
+/* $NetBSD: xirc.c,v 1.39 2023/05/10 00:12:20 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.38 2021/08/07 16:19:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.39 2023/05/10 00:12:20 riastradh Exp $");
#include "opt_inet.h"
@@ -396,17 +396,11 @@ int
xirc_detach(device_t self, int flags)
{
struct xirc_softc *sc = device_private(self);
- int rv;
-
- if (sc->sc_ethernet != NULL) {
- if ((rv = config_detach(sc->sc_ethernet, flags)) != 0)
- return rv;
- }
+ int error;
- if (sc->sc_modem != NULL) {
- if ((rv = config_detach(sc->sc_modem, flags)) != 0)
- return rv;
- }
+ error = config_detach_children(self, flags);
+ if (error)
+ return error;
/* Unmap our i/o windows. */
if (sc->sc_flags & XIRC_ETHERNET_MAPPED)
@@ -420,8 +414,7 @@ xirc_detach(device_t self, int flags)
if (sc->sc_flags & XIRC_MODEM_ALLOCED)
pcmcia_io_free(sc->sc_pf, &sc->sc_modem_pcioh);
sc->sc_flags = 0;
-
- return (0);
+ return 0;
}
int
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: riastradh Date: Wed May 10 00:12:20 UTC 2023 Modified Files: src/sys/dev/pcmcia: xirc.c Log Message: xirc(4): Use config_detach_children. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pcmcia/xirc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src
Committed By: riastradh
Date: Wed May 10 00:12:12 UTC 2023
Modified Files:
src/sys/dev/pcmcia: pcmcom.c
Log Message:
pcmcom(4): Use config_detach_children.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pcmcia/pcmcom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/pcmcom.c
diff -u src/sys/dev/pcmcia/pcmcom.c:1.44 src/sys/dev/pcmcia/pcmcom.c:1.45
--- src/sys/dev/pcmcia/pcmcom.c:1.44 Sun Sep 25 21:53:54 2022
+++ src/sys/dev/pcmcia/pcmcom.c Wed May 10 00:12:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcom.c,v 1.44 2022/09/25 21:53:54 thorpej Exp $ */
+/* $NetBSD: pcmcom.c,v 1.45 2023/05/10 00:12:12 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.44 2022/09/25 21:53:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.45 2023/05/10 00:12:12 riastradh Exp $");
#include
#include
@@ -202,23 +202,16 @@ int
pcmcom_detach(device_t self, int flags)
{
struct pcmcom_softc *sc = device_private(self);
- int slave, error;
-
- if (sc->sc_state != PCMCOM_ATTACHED)
- return (0);
+ int error;
- for (slave = sc->sc_nslaves - 1; slave >= 0; slave--) {
- if (sc->sc_slaves[slave]) {
- /* Detach the child. */
- error = config_detach(sc->sc_slaves[slave], flags);
- if (error)
-return (error);
- }
- }
+ error = config_detach_children(self, flags);
+ if (error)
+ return error;
+ if (sc->sc_state != PCMCOM_ATTACHED)
+ return 0;
pcmcia_function_unconfigure(sc->sc_pf);
-
- return (0);
+ return 0;
}
int
CVS commit: src/sys/dev/pcmcia
Module Name:src
Committed By: riastradh
Date: Wed May 10 00:12:05 UTC 2023
Modified Files:
src/sys/dev/pcmcia: mhzc.c
Log Message:
mhzc(4): Use config_detach_children.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pcmcia/mhzc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/mhzc.c
diff -u src/sys/dev/pcmcia/mhzc.c:1.55 src/sys/dev/pcmcia/mhzc.c:1.56
--- src/sys/dev/pcmcia/mhzc.c:1.55 Fri Jan 20 01:35:03 2023
+++ src/sys/dev/pcmcia/mhzc.c Wed May 10 00:12:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mhzc.c,v 1.55 2023/01/20 01:35:03 msaitoh Exp $ */
+/* $NetBSD: mhzc.c,v 1.56 2023/05/10 00:12:05 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.55 2023/01/20 01:35:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.56 2023/05/10 00:12:05 riastradh Exp $");
#include "opt_inet.h"
@@ -334,17 +334,11 @@ int
mhzc_detach(device_t self, int flags)
{
struct mhzc_softc *sc = device_private(self);
- int rv;
-
- if (sc->sc_ethernet != NULL) {
- if ((rv = config_detach(sc->sc_ethernet, flags)) != 0)
- return rv;
- }
+ int error;
- if (sc->sc_modem != NULL) {
- if ((rv = config_detach(sc->sc_modem, flags)) != 0)
- return rv;
- }
+ error = config_detach_children(self, flags);
+ if (error)
+ return error;
/* Unmap our i/o windows. */
if (sc->sc_flags & MHZC_MODEM_MAPPED)
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: riastradh Date: Wed May 10 00:12:12 UTC 2023 Modified Files: src/sys/dev/pcmcia: pcmcom.c Log Message: pcmcom(4): Use config_detach_children. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pcmcia/pcmcom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: riastradh Date: Wed May 10 00:12:05 UTC 2023 Modified Files: src/sys/dev/pcmcia: mhzc.c Log Message: mhzc(4): Use config_detach_children. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pcmcia/mhzc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: thorpej Date: Sun Sep 25 21:53:54 UTC 2022 Modified Files: src/sys/dev/pcmcia: if_xi.c pcmcom.c wdc_pcmcia.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pcmcia/if_xi.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pcmcia/pcmcom.c cvs rdiff -u -r1.129 -r1.130 src/sys/dev/pcmcia/wdc_pcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pcmcia/if_xi.c diff -u src/sys/dev/pcmcia/if_xi.c:1.95 src/sys/dev/pcmcia/if_xi.c:1.96 --- src/sys/dev/pcmcia/if_xi.c:1.95 Fri Apr 8 10:17:54 2022 +++ src/sys/dev/pcmcia/if_xi.c Sun Sep 25 21:53:54 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_xi.c,v 1.95 2022/04/08 10:17:54 andvar Exp $ */ +/* $NetBSD: if_xi.c,v 1.96 2022/09/25 21:53:54 thorpej Exp $ */ /* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */ /* @@ -55,7 +55,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.95 2022/04/08 10:17:54 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.96 2022/09/25 21:53:54 thorpej Exp $"); #include "opt_inet.h" @@ -64,7 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1. #include #include #include -#include #include #include #include Index: src/sys/dev/pcmcia/pcmcom.c diff -u src/sys/dev/pcmcia/pcmcom.c:1.43 src/sys/dev/pcmcia/pcmcom.c:1.44 --- src/sys/dev/pcmcia/pcmcom.c:1.43 Sat Aug 7 16:19:15 2021 +++ src/sys/dev/pcmcia/pcmcom.c Sun Sep 25 21:53:54 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: pcmcom.c,v 1.43 2021/08/07 16:19:15 thorpej Exp $ */ +/* $NetBSD: pcmcom.c,v 1.44 2022/09/25 21:53:54 thorpej Exp $ */ /*- * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -44,13 +44,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.43 2021/08/07 16:19:15 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.44 2022/09/25 21:53:54 thorpej Exp $"); #include #include #include #include -#include #include #include Index: src/sys/dev/pcmcia/wdc_pcmcia.c diff -u src/sys/dev/pcmcia/wdc_pcmcia.c:1.129 src/sys/dev/pcmcia/wdc_pcmcia.c:1.130 --- src/sys/dev/pcmcia/wdc_pcmcia.c:1.129 Tue Oct 5 08:21:10 2021 +++ src/sys/dev/pcmcia/wdc_pcmcia.c Sun Sep 25 21:53:54 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: wdc_pcmcia.c,v 1.129 2021/10/05 08:21:10 rin Exp $ */ +/* $NetBSD: wdc_pcmcia.c,v 1.130 2022/09/25 21:53:54 thorpej Exp $ */ /*- * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. @@ -30,12 +30,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.129 2021/10/05 08:21:10 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.130 2022/09/25 21:53:54 thorpej Exp $"); #include #include #include -#include #include #include
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: thorpej Date: Sun Sep 25 21:53:54 UTC 2022 Modified Files: src/sys/dev/pcmcia: if_xi.c pcmcom.c wdc_pcmcia.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pcmcia/if_xi.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pcmcia/pcmcom.c cvs rdiff -u -r1.129 -r1.130 src/sys/dev/pcmcia/wdc_pcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src
Committed By: andvar
Date: Sun Oct 17 20:33:27 UTC 2021
Modified Files:
src/sys/dev/pcmcia: pcmciadevs.h pcmciadevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.235 src/sys/dev/pcmcia/pcmciadevs.h \
src/sys/dev/pcmcia/pcmciadevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/pcmciadevs.h
diff -u src/sys/dev/pcmcia/pcmciadevs.h:1.234 src/sys/dev/pcmcia/pcmciadevs.h:1.235
--- src/sys/dev/pcmcia/pcmciadevs.h:1.234 Fri Mar 16 01:58:42 2018
+++ src/sys/dev/pcmcia/pcmciadevs.h Sun Oct 17 20:33:27 2021
@@ -1,10 +1,10 @@
-/* $NetBSD: pcmciadevs.h,v 1.234 2018/03/16 01:58:42 sevan Exp $ */
+/* $NetBSD: pcmciadevs.h,v 1.235 2021/10/17 20:33:27 andvar Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcmciadevs,v 1.234 2018/03/16 01:49:15 sevan Exp
+ * NetBSD: pcmciadevs,v 1.235 2019/04/06 04:52:44 msaitoh Exp
*/
/* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
@@ -38,8 +38,8 @@
*/
/*
- * Use "make -f Makefile.pcmciadevs" to regenerate pcmicadevs.h and
- * pcmicadevs_data.h
+ * Use "make -f Makefile.pcmciadevs" to regenerate pcmciadevs.h and
+ * pcmciadevs_data.h
*/
/*
Index: src/sys/dev/pcmcia/pcmciadevs_data.h
diff -u src/sys/dev/pcmcia/pcmciadevs_data.h:1.234 src/sys/dev/pcmcia/pcmciadevs_data.h:1.235
--- src/sys/dev/pcmcia/pcmciadevs_data.h:1.234 Fri Mar 16 01:58:42 2018
+++ src/sys/dev/pcmcia/pcmciadevs_data.h Sun Oct 17 20:33:27 2021
@@ -1,10 +1,10 @@
-/* $NetBSD: pcmciadevs_data.h,v 1.234 2018/03/16 01:58:42 sevan Exp $ */
+/* $NetBSD: pcmciadevs_data.h,v 1.235 2021/10/17 20:33:27 andvar Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcmciadevs,v 1.234 2018/03/16 01:49:15 sevan Exp
+ * NetBSD: pcmciadevs,v 1.235 2019/04/06 04:52:44 msaitoh Exp
*/
/* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
@@ -705,7 +705,7 @@ struct pcmcia_knowndev pcmcia_knowndevs[
PCMCIA_CIS_LINKSYS2_IWN3,
0,
"The Linksys Group",
- "Instant Wireless Network PC Card, Versin 3", }
+ "Instant Wireless Network PC Card, Version 3", }
,
{
PCMCIA_VENDOR_LINKSYS2, PCMCIA_PRODUCT_LINKSYS2_WCF11,
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: andvar Date: Sun Oct 17 20:33:27 UTC 2021 Modified Files: src/sys/dev/pcmcia: pcmciadevs.h pcmciadevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.234 -r1.235 src/sys/dev/pcmcia/pcmciadevs.h \ src/sys/dev/pcmcia/pcmciadevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: andvar Date: Sun Oct 17 20:33:05 UTC 2021 Modified Files: src/sys/dev/pcmcia: pcmciadevs Log Message: s/Versin/Version/ To generate a diff of this commit: cvs rdiff -u -r1.235 -r1.236 src/sys/dev/pcmcia/pcmciadevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pcmcia/pcmciadevs diff -u src/sys/dev/pcmcia/pcmciadevs:1.235 src/sys/dev/pcmcia/pcmciadevs:1.236 --- src/sys/dev/pcmcia/pcmciadevs:1.235 Sat Apr 6 04:52:44 2019 +++ src/sys/dev/pcmcia/pcmciadevs Sun Oct 17 20:33:05 2021 @@ -1,4 +1,4 @@ -$NetBSD: pcmciadevs,v 1.235 2019/04/06 04:52:44 msaitoh Exp $ +$NetBSD: pcmciadevs,v 1.236 2021/10/17 20:33:05 andvar Exp $ /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/ /*- @@ -289,7 +289,7 @@ product LINKSYS ETHERFAST 0x0230 Linksys product LINKSYS ECARD_1 0x0265 Linksys EthernetCard or D-Link DE-650 product LINKSYS COMBO_ECARD 0xc1ab Linksys Combo EthernetCard product LINKSYS2 IWN 0x1612 Instant Wireless Network PC Card -product LINKSYS2 IWN3 0x1613 Instant Wireless Network PC Card, Versin 3 +product LINKSYS2 IWN3 0x1613 Instant Wireless Network PC Card, Version 3 product LINKSYS2 WCF11 0x3301 Instant Wireless Network CF Card /* Lucent */
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: andvar Date: Sun Oct 17 20:33:05 UTC 2021 Modified Files: src/sys/dev/pcmcia: pcmciadevs Log Message: s/Versin/Version/ To generate a diff of this commit: cvs rdiff -u -r1.235 -r1.236 src/sys/dev/pcmcia/pcmciadevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src
Committed By: rin
Date: Tue Oct 5 08:21:10 UTC 2021
Modified Files:
src/sys/dev/pcmcia: wdc_pcmcia.c
Log Message:
Advertise ATAC_CAP_DATA32 also for memory-mapped mode.
It seems that this flag bit is not enabled because memory-mapped mode
has its own wdc_softc:data{in,out}_pio routines. However, nowadays,
32-bit data access capability of a disk drive is not checked by ata(4)
backend unless this flag bit is set.
Tested with CF cards of few vendors and hd64461pcmcia(4) found for some
hpcsh machine models.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/pcmcia/wdc_pcmcia.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/wdc_pcmcia.c
diff -u src/sys/dev/pcmcia/wdc_pcmcia.c:1.128 src/sys/dev/pcmcia/wdc_pcmcia.c:1.129
--- src/sys/dev/pcmcia/wdc_pcmcia.c:1.128 Tue Oct 5 08:08:40 2021
+++ src/sys/dev/pcmcia/wdc_pcmcia.c Tue Oct 5 08:21:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pcmcia.c,v 1.128 2021/10/05 08:08:40 rin Exp $ */
+/* $NetBSD: wdc_pcmcia.c,v 1.129 2021/10/05 08:21:10 rin Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.128 2021/10/05 08:08:40 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.129 2021/10/05 08:21:10 rin Exp $");
#include
#include
@@ -231,7 +231,7 @@ wdc_pcmcia_attach(device_t parent, devic
}
cfe = pa->pf->cfe;
- sc->sc_wdcdev.sc_atac.atac_cap |= ATAC_CAP_DATA16;
+ sc->sc_wdcdev.sc_atac.atac_cap |= ATAC_CAP_DATA16 | ATAC_CAP_DATA32;
sc->sc_wdcdev.regs = wdr = &sc->wdc_regs;
@@ -286,7 +286,6 @@ wdc_pcmcia_attach(device_t parent, devic
aprint_normal_dev(self, "i/o mapped mode\n");
wdr->data32iot = wdr->cmd_iot;
wdr->data32ioh = wdr->cmd_iohs[wd_data];
- sc->sc_wdcdev.sc_atac.atac_cap |= ATAC_CAP_DATA32;
}
sc->sc_wdcdev.sc_atac.atac_pio_cap = 0;
CVS commit: src/sys/dev/pcmcia
Module Name:src
Committed By: rin
Date: Tue Oct 5 08:21:10 UTC 2021
Modified Files:
src/sys/dev/pcmcia: wdc_pcmcia.c
Log Message:
Advertise ATAC_CAP_DATA32 also for memory-mapped mode.
It seems that this flag bit is not enabled because memory-mapped mode
has its own wdc_softc:data{in,out}_pio routines. However, nowadays,
32-bit data access capability of a disk drive is not checked by ata(4)
backend unless this flag bit is set.
Tested with CF cards of few vendors and hd64461pcmcia(4) found for some
hpcsh machine models.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/pcmcia/wdc_pcmcia.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src
Committed By: rin
Date: Tue Oct 5 08:08:40 UTC 2021
Modified Files:
src/sys/dev/pcmcia: wdc_pcmcia.c
Log Message:
Do not establish the unused interrupt handler for memory-mapped mode,
for the sake of clarity.
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/pcmcia/wdc_pcmcia.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/wdc_pcmcia.c
diff -u src/sys/dev/pcmcia/wdc_pcmcia.c:1.127 src/sys/dev/pcmcia/wdc_pcmcia.c:1.128
--- src/sys/dev/pcmcia/wdc_pcmcia.c:1.127 Mon Sep 3 16:29:33 2018
+++ src/sys/dev/pcmcia/wdc_pcmcia.c Tue Oct 5 08:08:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pcmcia.c,v 1.127 2018/09/03 16:29:33 riastradh Exp $ */
+/* $NetBSD: wdc_pcmcia.c,v 1.128 2021/10/05 08:08:40 rin Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.127 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.128 2021/10/05 08:08:40 rin Exp $");
#include
#include
@@ -372,22 +372,28 @@ wdc_pcmcia_enable(device_t self, int ono
#endif
if (onoff) {
- /* Establish the interrupt handler. */
- sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_BIO,
- wdcintr, &sc->ata_channel);
- if (!sc->sc_ih)
- return (EIO);
+ if (!(sc->sc_wdcdev.sc_atac.atac_cap & ATAC_CAP_NOIRQ)) {
+ /* Establish the interrupt handler. */
+ sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_BIO,
+ wdcintr, &sc->ata_channel);
+ if (!sc->sc_ih)
+return (EIO);
+ }
error = pcmcia_function_enable(sc->sc_pf);
if (error) {
- pcmcia_intr_disestablish(sc->sc_pf, sc->sc_ih);
- sc->sc_ih = 0;
+ if (sc->sc_ih) {
+pcmcia_intr_disestablish(sc->sc_pf, sc->sc_ih);
+sc->sc_ih = 0;
+ }
return (error);
}
} else {
pcmcia_function_disable(sc->sc_pf);
- pcmcia_intr_disestablish(sc->sc_pf, sc->sc_ih);
- sc->sc_ih = 0;
+ if (sc->sc_ih) {
+ pcmcia_intr_disestablish(sc->sc_pf, sc->sc_ih);
+ sc->sc_ih = 0;
+ }
}
return (0);
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: rin Date: Tue Oct 5 08:08:40 UTC 2021 Modified Files: src/sys/dev/pcmcia: wdc_pcmcia.c Log Message: Do not establish the unused interrupt handler for memory-mapped mode, for the sake of clarity. To generate a diff of this commit: cvs rdiff -u -r1.127 -r1.128 src/sys/dev/pcmcia/wdc_pcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: kre Date: Fri Oct 11 04:25:11 UTC 2019 Modified Files: src/sys/dev/pcmcia: if_malo_pcmcia.c Log Message: Delete unused var (made redundant in previous commit). Unbreak build. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pcmcia/if_malo_pcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pcmcia/if_malo_pcmcia.c diff -u src/sys/dev/pcmcia/if_malo_pcmcia.c:1.22 src/sys/dev/pcmcia/if_malo_pcmcia.c:1.23 --- src/sys/dev/pcmcia/if_malo_pcmcia.c:1.22 Thu Oct 10 23:37:13 2019 +++ src/sys/dev/pcmcia/if_malo_pcmcia.c Fri Oct 11 04:25:11 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_malo_pcmcia.c,v 1.22 2019/10/10 23:37:13 bad Exp $ */ +/* $NetBSD: if_malo_pcmcia.c,v 1.23 2019/10/11 04:25:11 kre Exp $ */ /* $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */ /* @@ -18,7 +18,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.22 2019/10/10 23:37:13 bad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.23 2019/10/11 04:25:11 kre Exp $"); #ifdef _MODULE #include @@ -1308,7 +1308,6 @@ cmalo_cmd_rsp_hwspec(struct malo_softc * struct ieee80211com *ic = &sc->sc_ic; struct malo_cmd_header *hdr = (struct malo_cmd_header *)sc->sc_cmd; struct malo_cmd_body_spec *body; - int i; body = (struct malo_cmd_body_spec *)(hdr + 1);
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: kre Date: Fri Oct 11 04:25:11 UTC 2019 Modified Files: src/sys/dev/pcmcia: if_malo_pcmcia.c Log Message: Delete unused var (made redundant in previous commit). Unbreak build. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pcmcia/if_malo_pcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: bad Date: Thu Oct 10 23:37:13 UTC 2019 Modified Files: src/sys/dev/pcmcia: if_malo_pcmcia.c Log Message: if we can memcpy to body->macaddr, we can memcpy from it. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pcmcia/if_malo_pcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pcmcia/if_malo_pcmcia.c diff -u src/sys/dev/pcmcia/if_malo_pcmcia.c:1.21 src/sys/dev/pcmcia/if_malo_pcmcia.c:1.22 --- src/sys/dev/pcmcia/if_malo_pcmcia.c:1.21 Tue Mar 5 08:25:02 2019 +++ src/sys/dev/pcmcia/if_malo_pcmcia.c Thu Oct 10 23:37:13 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_malo_pcmcia.c,v 1.21 2019/03/05 08:25:02 msaitoh Exp $ */ +/* $NetBSD: if_malo_pcmcia.c,v 1.22 2019/10/10 23:37:13 bad Exp $ */ /* $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */ /* @@ -18,7 +18,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.21 2019/03/05 08:25:02 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.22 2019/10/10 23:37:13 bad Exp $"); #ifdef _MODULE #include @@ -1313,8 +1313,7 @@ cmalo_cmd_rsp_hwspec(struct malo_softc * body = (struct malo_cmd_body_spec *)(hdr + 1); /* get our MAC address */ - for (i = 0; i < ETHER_ADDR_LEN; i++) - ic->ic_myaddr[i] = body->macaddr[i]; + memcpy(ic->ic_myaddr, body->macaddr, ETHER_ADDR_LEN); return 0; }
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: bad Date: Thu Oct 10 23:37:13 UTC 2019 Modified Files: src/sys/dev/pcmcia: if_malo_pcmcia.c Log Message: if we can memcpy to body->macaddr, we can memcpy from it. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pcmcia/if_malo_pcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: mrg Date: Sat Oct 5 01:35:26 UTC 2019 Modified Files: src/sys/dev/pcmcia: xirc.c Log Message: add missing break. (this code is fun. it has switch inside switch, and both switches have two cases, one with an identifier and one with a magic number.) To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pcmcia/xirc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pcmcia/xirc.c diff -u src/sys/dev/pcmcia/xirc.c:1.35 src/sys/dev/pcmcia/xirc.c:1.36 --- src/sys/dev/pcmcia/xirc.c:1.35 Sat Dec 8 17:46:14 2018 +++ src/sys/dev/pcmcia/xirc.c Sat Oct 5 01:35:26 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: xirc.c,v 1.35 2018/12/08 17:46:14 thorpej Exp $ */ +/* $NetBSD: xirc.c,v 1.36 2019/10/05 01:35:26 mrg Exp $ */ /*- * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.35 2018/12/08 17:46:14 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.36 2019/10/05 01:35:26 mrg Exp $"); #include "opt_inet.h" @@ -694,6 +694,7 @@ xi_xirc_lan_nid_ciscallback(struct pcmci myla[i] = pcmcia_tuple_read_1(tuple, i + 3); return (1); } + break; case 0x89: if (pcmcia_tuple_read_1(tuple, 0) != 0x04 ||
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: mrg Date: Sat Oct 5 01:35:26 UTC 2019 Modified Files: src/sys/dev/pcmcia: xirc.c Log Message: add missing break. (this code is fun. it has switch inside switch, and both switches have two cases, one with an identifier and one with a magic number.) To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pcmcia/xirc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: mlelstv Date: Sun Sep 1 00:36:52 UTC 2019 Modified Files: src/sys/dev/pcmcia: pcmciareg.h Log Message: add PCMCIA_CISTPL_SDIO definition. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pcmcia/pcmciareg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: mlelstv Date: Sun Sep 1 00:36:52 UTC 2019 Modified Files: src/sys/dev/pcmcia: pcmciareg.h Log Message: add PCMCIA_CISTPL_SDIO definition. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pcmcia/pcmciareg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pcmcia/pcmciareg.h diff -u src/sys/dev/pcmcia/pcmciareg.h:1.10 src/sys/dev/pcmcia/pcmciareg.h:1.11 --- src/sys/dev/pcmcia/pcmciareg.h:1.10 Sun Dec 11 12:23:23 2005 +++ src/sys/dev/pcmcia/pcmciareg.h Sun Sep 1 00:36:52 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pcmciareg.h,v 1.10 2005/12/11 12:23:23 christos Exp $ */ +/* $NetBSD: pcmciareg.h,v 1.11 2019/09/01 00:36:52 mlelstv Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -202,6 +202,7 @@ /* #define PCMCIA_CISTPL_RESERVED 0x80-0x8F */ #define PCMCIA_CISTPL_SPCL 0x90 +#define PCMCIA_CISTPL_SDIO 0x91 /* #define PCMCIA_CISTPL_RESERVED 0x90-0xFE */ /*
Re: CVS commit: src/sys/dev/pcmcia
By the way, this code appears to do bogus things with i_len, like "clear trailing garbage" except using the wrong (constant) length. it's possible it doesn't work for SSIDs longer than NETWORK_NAME due to that, but I don't have one or have the confidence to fix it blindly. On Thu, Jan 12, 2017 at 05:11:22PM +, Maya Rashish wrote: > Module Name: src > Committed By: maya > Date: Thu Jan 12 17:11:22 UTC 2017 > > Modified Files: > src/sys/dev/pcmcia: if_ray.c > > Log Message: > Remove dead code. RAY_DEF_NWID is a constant string, its length will never > be above 32. > > > To generate a diff of this commit: > cvs rdiff -u -r1.84 -r1.85 src/sys/dev/pcmcia/if_ray.c > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. > > Modified files: > > Index: src/sys/dev/pcmcia/if_ray.c > diff -u src/sys/dev/pcmcia/if_ray.c:1.84 src/sys/dev/pcmcia/if_ray.c:1.85 > --- src/sys/dev/pcmcia/if_ray.c:1.84 Thu Jul 7 06:55:42 2016 > +++ src/sys/dev/pcmcia/if_ray.c Thu Jan 12 17:11:22 2017 > @@ -1,4 +1,4 @@ > -/* $NetBSD: if_ray.c,v 1.84 2016/07/07 06:55:42 msaitoh Exp $ */ > +/* $NetBSD: if_ray.c,v 1.85 2017/01/12 17:11:22 maya Exp $ */ > > /* > * Copyright (c) 2000 Christian E. Hopps > @@ -57,7 +57,7 @@ > */ > > #include > -__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.84 2016/07/07 06:55:42 msaitoh Exp > $"); > +__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.85 2017/01/12 17:11:22 maya Exp $"); > > #include "opt_inet.h" > > @@ -553,8 +553,6 @@ ray_attach(device_t parent, device_t sel >*/ > memset(&sc->sc_dnwid, 0, sizeof(sc->sc_dnwid)); > sc->sc_dnwid.i_len = strlen(RAY_DEF_NWID); > - if (sc->sc_dnwid.i_len > IEEE80211_NWID_LEN) > - sc->sc_dnwid.i_len = IEEE80211_NWID_LEN; > if (sc->sc_dnwid.i_len > 0) > memcpy(sc->sc_dnwid.i_nwid, RAY_DEF_NWID, sc->sc_dnwid.i_len); > memcpy(&sc->sc_cnwid, &sc->sc_dnwid, sizeof(sc->sc_cnwid)); >
Re: CVS commit: src/sys/dev/pcmcia
Ah, OK. I will fix shortly.
On Tue, 22 Apr 2014, Joerg Sonnenberger wrote:
On Mon, Apr 21, 2014 at 08:24:21PM +, Paul Goyette wrote:
Module Name:src
Committed By: pgoyette
Date: Mon Apr 21 20:24:21 UTC 2014
Modified Files:
src/sys/dev/pcmcia: if_malo_pcmcia.c
Log Message:
Insert { ... } to keep gcc happy when DPRINTF() macro is empty.
This is wrong. DPRINTF should expand to do {} while (0) in !DEBUG case.
Joerg
!DSPAM:53559bfb212621094619121!
-
| Paul Goyette | PGP Key fingerprint: | E-mail addresses: |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com|
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer | | pgoyette at netbsd.org |
-
Re: CVS commit: src/sys/dev/pcmcia
On Mon, Apr 21, 2014 at 08:24:21PM +, Paul Goyette wrote:
> Module Name: src
> Committed By: pgoyette
> Date: Mon Apr 21 20:24:21 UTC 2014
>
> Modified Files:
> src/sys/dev/pcmcia: if_malo_pcmcia.c
>
> Log Message:
> Insert { ... } to keep gcc happy when DPRINTF() macro is empty.
This is wrong. DPRINTF should expand to do {} while (0) in !DEBUG case.
Joerg
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: dyoung Date: Fri Jan 8 20:01:00 UTC 2010 Modified Files: src/sys/dev/pcmcia: bt3c.c btbc.c Log Message: Expand PMF_FN_* macros. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pcmcia/bt3c.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pcmcia/btbc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: christos Date: Sat Jan 2 01:43:12 UTC 2010 Modified Files: src/sys/dev/pcmcia: if_ne_pcmcia.c Log Message: convert to pmf To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 src/sys/dev/pcmcia/if_ne_pcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
