Author: imp
Date: Sat Nov 22 18:40:14 2014
New Revision: 274879
URL: https://svnweb.freebsd.org/changeset/base/274879
Log:
Retire old, transition code for managing the FreeBSD 5 -> 6 migration.
Modified:
head/sys/dev/pccard/pccardvar.h
head/sys/dev/wi/if_wi_pccard.c
Modified: head/sys/dev/pccard/pccardvar.h
==============================================================================
--- head/sys/dev/pccard/pccardvar.h Sat Nov 22 18:15:02 2014
(r274878)
+++ head/sys/dev/pccard/pccardvar.h Sat Nov 22 18:40:14 2014
(r274879)
@@ -31,18 +31,6 @@
*/
/*
- * PCCARD_API_LEVEL. When set to 5, we provide a 5.x compatible API
- * for driver writers that have to share their code between 5.x and 6.x.
- * The 5.x compatibility interfaces will be unsupported in 7.0, at which
- * point we'll only support 6 and newer, etc.
- */
-#ifndef PCCARD_API_LEVEL
-#define PCCARD_API_LEVEL 6
-#elif PCCARD_API_LEVEL < 5
-#error "pccard API less than 5 unsupported"
-#endif
-
-/*
* Contains information about mapped/allocated i/o spaces.
*/
struct pccard_io_handle {
@@ -229,7 +217,6 @@ enum {
#define PCCARD_S(a, b) PCMCIA_STR_ ## a ## _ ## b
#define PCCARD_P(a, b) PCMCIA_PRODUCT_ ## a ## _ ## b
#define PCCARD_C(a, b) PCMCIA_CIS_ ## a ## _ ## b
-#if PCCARD_API_LEVEL >= 6
#define PCMCIA_CARD_D(v, p) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \
PCCARD_P(v, p), PCCARD_C(v, p) }
#define PCMCIA_CARD2_D(v1, p1, p2) \
@@ -240,18 +227,6 @@ enum {
#define PCMCIA_CARD2(v1, p1, p2) \
{ NULL, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \
PCMCIA_CIS_ ## p2}
-#else
-#define PCMCIA_CARD_D(v, p, f) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \
- PCCARD_P(v, p), PCCARD_C(v, p) }
-#define PCMCIA_CARD2_D(v1, p1, p2, f) \
- { PCMCIA_STR_ ## p2, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \
- PCMCIA_CIS_ ## p2}
-#define PCMCIA_CARD(v, p, f) { NULL, PCMCIA_VENDOR_ ## v, \
- PCCARD_P(v, p), PCCARD_C(v, p) }
-#define PCMCIA_CARD2(v1, p1, p2, f) \
- { NULL, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \
- PCMCIA_CIS_ ## p2}
-#endif
/*
* Defines to decode the get_funce_disk return value. See the PCMCIA standard
Modified: head/sys/dev/wi/if_wi_pccard.c
==============================================================================
--- head/sys/dev/wi/if_wi_pccard.c Sat Nov 22 18:15:02 2014
(r274878)
+++ head/sys/dev/wi/if_wi_pccard.c Sat Nov 22 18:40:14 2014
(r274879)
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_radiotap.h>
-#define PCCARD_API_LEVEL 6
#include <dev/pccard/pccardvar.h>
#include <dev/pccard/pccard_cis.h>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
