[src/netbsd-1-6]: src/sys/dev/pcmcia Pullup to rev 1.17 (requested in ticket ...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5304042d4ca5
branches:  netbsd-1-6
changeset: 530909:5304042d4ca5
user:      jmc <jmc%NetBSD.org@localhost>
date:      Tue Oct 21 03:45:29 2003 +0000

description:
Pullup to rev 1.17 (requested in ticket #699)
Enable support for multi-function pcmcia cards.

diffstat:

 sys/dev/pcmcia/pcmciavar.h |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r e332f4c91f38 -r 5304042d4ca5 sys/dev/pcmcia/pcmciavar.h
--- a/sys/dev/pcmcia/pcmciavar.h        Tue Oct 21 03:43:18 2003 +0000
+++ b/sys/dev/pcmcia/pcmciavar.h        Tue Oct 21 03:45:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcmciavar.h,v 1.15 2001/12/15 13:23:23 soren Exp $     */
+/*     $NetBSD: pcmciavar.h,v 1.15.10.1 2003/10/21 03:45:29 jmc Exp $  */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -155,6 +155,8 @@
 /* pf_flags */
 #define        PFF_ENABLED     0x0001          /* function is enabled */
 
+SIMPLEQ_HEAD(pcmcia_function_head, pcmcia_function);
+
 struct pcmcia_card {
        int             cis1_major;
        int             cis1_minor;
@@ -172,7 +174,7 @@
 #define        PCMCIA_PRODUCT_INVALID          -1
        u_int16_t       error;
 #define        PCMCIA_CIS_INVALID              { NULL, NULL, NULL, NULL }
-       SIMPLEQ_HEAD(, pcmcia_function) pf_head;
+       struct pcmcia_function_head     pf_head;
 };
 
 struct pcmcia_softc {
@@ -278,8 +280,8 @@
 int    pcmcia_ccr_read __P((struct pcmcia_function *, int));
 void   pcmcia_ccr_write __P((struct pcmcia_function *, int, int));
 
-#define        pcmcia_mfc(sc)  ((sc)->card.pf_head.sqh_first &&                \
-                        (sc)->card.pf_head.sqh_first->pf_list.sqe_next)
+#define        pcmcia_mfc(sc)  (! SIMPLEQ_EMPTY(&(sc)->card.pf_head) &&        \
+                SIMPLEQ_NEXT(SIMPLEQ_FIRST(&(sc)->card.pf_head), pf_list))
 
 void   pcmcia_function_init __P((struct pcmcia_function *,
            struct pcmcia_config_entry *));
@@ -297,6 +299,8 @@
            bus_size_t, struct pcmcia_io_handle *, int *));
 void   pcmcia_io_unmap __P((struct pcmcia_function *, int));
 
+void   pcmcia_free_pf __P((struct pcmcia_function_head *));
+
 #define pcmcia_mem_alloc(pf, size, pcmhp)                              \
        (pcmcia_chip_mem_alloc((pf)->sc->pct, (pf)->sc->pch, (size), (pcmhp)))