From owner-svn-src-head@FreeBSD.ORG Sat Nov 22 18:40:16 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C28DDCD; Sat, 22 Nov 2014 18:40:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F274A2E0; Sat, 22 Nov 2014 18:40:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMIeFYn021947; Sat, 22 Nov 2014 18:40:15 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMIeFKY021945; Sat, 22 Nov 2014 18:40:15 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201411221840.sAMIeFKY021945@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 22 Nov 2014 18:40:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274879 - in head/sys/dev: pccard wi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 18:40:16 -0000 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 #include -#define PCCARD_API_LEVEL 6 #include #include