svn commit: r188631 - head/usr.sbin/sysinstall

[Warner Losh]

Author: imp
Date: Sun Feb 15 03:10:20 2009
New Revision: 188631
URL: http://svn.freebsd.org/changeset/base/188631

Log:
  Remove vestiges of OLDCARD PC Card support.  We haven't needed/used
  this since 5.x.

Deleted:
  head/usr.sbin/sysinstall/pccard.c
Modified:
  head/usr.sbin/sysinstall/install.c
  head/usr.sbin/sysinstall/main.c
  head/usr.sbin/sysinstall/menus.c
  head/usr.sbin/sysinstall/options.c
  head/usr.sbin/sysinstall/sysinstall.h
  head/usr.sbin/sysinstall/tcpip.c

Modified: head/usr.sbin/sysinstall/install.c
==============================================================================
--- head/usr.sbin/sysinstall/install.c	Sun Feb 15 03:04:20 2009	(r188630)
+++ head/usr.sbin/sysinstall/install.c	Sun Feb 15 03:10:20 2009	(r188631)
@@ -1184,7 +1184,6 @@ installVarDefaults(dialogMenuItem *self)
     variable_set2(VAR_CPIO_VERBOSITY,		"high", 0);
     variable_set2(VAR_INSTALL_ROOT,		"/", 0);
     variable_set2(VAR_INSTALL_CFG,		"install.cfg", 0);
-    variable_set2(VAR_SKIP_PCCARD,		"NO", 0);
     cp = getenv("EDITOR");
     if (!cp)
 	cp = "/usr/bin/ee";

Modified: head/usr.sbin/sysinstall/main.c
==============================================================================
--- head/usr.sbin/sysinstall/main.c	Sun Feb 15 03:04:20 2009	(r188630)
+++ head/usr.sbin/sysinstall/main.c	Sun Feb 15 03:10:20 2009	(r188631)
@@ -129,16 +129,6 @@ main(int argc, char **argv)
 	pvariable_set("modulesInitialize=1");
     }
 
-    /* Initialize PC Card, if we haven't already done so. */
-#ifdef PCCARD_ARCH
-    if (!variable_cmp(VAR_SKIP_PCCARD, "YES") &&
-      variable_get(VAR_SKIP_PCCARD)!=1 &&
-       !pvariable_get("pccardInitialize")) {
-	pccardInitialize();
-	pvariable_set("pccardInitialize=1");
-    }
-#endif
-
     /* Probe for all relevant devices on the system */
     deviceGetAll();
 

Modified: head/usr.sbin/sysinstall/menus.c
==============================================================================
--- head/usr.sbin/sysinstall/menus.c	Sun Feb 15 03:04:20 2009	(r188630)
+++ head/usr.sbin/sysinstall/menus.c	Sun Feb 15 03:10:20 2009	(r188631)
@@ -1168,14 +1168,6 @@ DMenu MenuStartup = {
       { " APM",		"Auto-power management services (typically laptops)",
 	dmenuVarCheck,	dmenuToggleVariable, NULL, "apm_enable=YES" },
 #endif
-#ifdef PCCARD_ARCH
-      { " pccard",	"Enable PCCARD (AKA PCMCIA) services (also laptops)",
-	dmenuVarCheck, dmenuToggleVariable, NULL, "pccard_enable=YES" },
-      { " pccard mem",	"Set PCCARD memory address (if enabled)",
-	dmenuVarCheck, dmenuISetVariable, NULL, "pccard_mem" },
-      { " pccard ifconfig",	"List of PCCARD ethernet devices to configure",
-	dmenuVarCheck, dmenuISetVariable, NULL, "pccard_ifconfig" },
-#endif
       { " ",		" -- ", NULL,	NULL, NULL, NULL, ' ', ' ', ' ' },
       { " Startup dirs",	"Set the list of dirs to look for startup scripts",
 	dmenuVarCheck, dmenuISetVariable, NULL, "local_startup" },

Modified: head/usr.sbin/sysinstall/options.c
==============================================================================
--- head/usr.sbin/sysinstall/options.c	Sun Feb 15 03:04:20 2009	(r188630)
+++ head/usr.sbin/sysinstall/options.c	Sun Feb 15 03:10:20 2009	(r188631)
@@ -122,8 +122,6 @@ static Option Options[] = {
       OPT_IS_VAR,	NULL,			VAR_TRY_DHCP,		varCheck	},
 { "IPv6",		"Attempt IPv6 configuration of interfaces",
       OPT_IS_VAR,	NULL,			VAR_TRY_RTSOL,		varCheck	},
-{ "Skip PCCARD",	"Skip PC Card probing, do not use PC Card devices for installation",
-      OPT_IS_VAR,	NULL,			VAR_SKIP_PCCARD,	varCheck	},
 { "FTP username",	"Username and password to use instead of anonymous",
       OPT_IS_FUNC,	mediaSetFTPUserPass,	VAR_FTP_USER,		varCheck	},
 { "Editor",		"Which text editor to use during installation",

Modified: head/usr.sbin/sysinstall/sysinstall.h
==============================================================================
--- head/usr.sbin/sysinstall/sysinstall.h	Sun Feb 15 03:04:20 2009	(r188630)
+++ head/usr.sbin/sysinstall/sysinstall.h	Sun Feb 15 03:10:20 2009	(r188631)
@@ -184,7 +184,6 @@
 #define VAR_SWAP_SIZE			"swapSize"
 #define VAR_TRY_DHCP			"tryDHCP"
 #define VAR_TRY_RTSOL			"tryRTSOL"
-#define VAR_SKIP_PCCARD			"skipPCCARD"
 #define VAR_UFS_PATH			"ufs"
 #define VAR_USR_SIZE			"usrSize"
 #define VAR_VAR_SIZE			"varSize"
@@ -813,9 +812,6 @@ extern int	package_add(char *name);
 extern int	package_extract(Device *dev, char *name, Boolean depended);
 extern Boolean	package_installed(char *name);
 
-/* pccard.c */
-extern void	pccardInitialize(void);
-
 /* system.c */
 extern void	systemInitialize(int argc, char **argv);
 extern void	systemShutdown(int status);

Modified: head/usr.sbin/sysinstall/tcpip.c
==============================================================================
--- head/usr.sbin/sysinstall/tcpip.c	Sun Feb 15 03:04:20 2009	(r188630)
+++ head/usr.sbin/sysinstall/tcpip.c	Sun Feb 15 03:10:20 2009	(r188631)
@@ -567,9 +567,6 @@ netconfig:
     if (!cancel) {
 	DevInfo *di;
 	char temp[512], ifn[255];
-#ifdef PCCARD_ARCH
-	char *pccard;
-#endif
 	int ipv4_enable = FALSE;
 
 	if (hostname[0]) {
@@ -610,12 +607,6 @@ netconfig:
 			ipaddr, extras, netmask);
 	    variable_set2(ifn, temp, 1);
 	}
-#ifdef PCCARD_ARCH
-	pccard = variable_get("_pccard_install");
-	if (pccard && strcmp(pccard, "YES") == 0 && ipv4_enable) {
-	    variable_set2("pccard_ifconfig", temp, 1);
-	}
-#endif
 	if (use_rtsol)
 	    variable_set2(VAR_IPV6_ENABLE, "YES", 1);
 	if (!use_dhcp)