[illumos-gate merge]

commit 4f9a6360ccbecd9ff675131a0d72925cdde1b18b
    4120 /etc/mach and 32-bit sd belong in system/kernel
commit 506aa7c68b127eefb0197e329af7e9abcc3ebc98
    4166 EOF pcata
    4167 EOF pcser
    2995 pcan and pcwl wifi device drivers EOL

4 files changed, 3 insertions, 158 deletions

diff --git a/usr/src/cmd/devfsadm/port_link.c b/usr/src/cmd/devfsadm/port_link.c
index 70579acbbc..f62254e3bc 100644
--- a/usr/src/cmd/devfsadm/port_link.c
+++ b/usr/src/cmd/devfsadm/port_link.c
@@ -20,6 +20,7 @@
  */
 
 /*
+ * Copyright 2013 Garrett D'Amore <garrett@damore.org>
  * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
@@ -144,8 +145,6 @@ static int dialout_create(di_minor_t minor, di_node_t node);
 static int onbrd_dialout_create(di_minor_t minor, di_node_t node);
 static int rsc_port_create(di_minor_t minor, di_node_t node);
 static int lom_port_create(di_minor_t minor, di_node_t node);
-static int pcmcia_port_create(di_minor_t minor, di_node_t node);
-static int pcmcia_dialout_create(di_minor_t minor, di_node_t node);
 static void rm_dangling_port(char *devname);
 static void update_sacadm_db(void);
 static int parse_portno(char *dname);
@@ -170,10 +169,6 @@ static devfsadm_create_t ports_cbt[] = {
 	    TYPE_EXACT | DRV_EXACT, ILEVEL_1, rsc_port_create},
 	{"port", "ddi_serial:lomcon", "su",
 	    TYPE_EXACT | DRV_EXACT, ILEVEL_1, lom_port_create},
-	{"port", "ddi_serial", "pcser",
-	    TYPE_EXACT | DRV_EXACT, ILEVEL_1, pcmcia_port_create},
-	{"port", "ddi_serial:dialout", "pcser",
-	    TYPE_EXACT | DRV_EXACT, ILEVEL_1, pcmcia_dialout_create},
 	{"port", "ddi_serial", NULL,
 	    TYPE_EXACT, ILEVEL_0, serial_port_create},
 	{"port", "ddi_serial:mb", NULL,
@@ -675,78 +670,6 @@ lom_port_create(di_minor_t minor, di_node_t node)
 	return (DEVFSADM_CONTINUE);
 }
 
-/*
- * PCMCIA serial ports
- * Creates links of the form "/dev/term/pcN", where N is the PCMCIA
- * socket # the device is plugged into.
- */
-#define	PCMCIA_MAX_SOCKETS	64
-#define	PCMCIA_SOCKETNO(x)	((x) & (PCMCIA_MAX_SOCKETS - 1))
-
-static int
-pcmcia_port_create(di_minor_t minor, di_node_t node)
-{
-	char l_path[MAXPATHLEN];
-	char  *devfspath;
-	int socket, *intp;
-
-	devfspath = di_devfs_path(node);
-	if (devfspath == NULL) {
-		devfsadm_errprint("%s: di_devfs_path() failed\n", modname);
-		return (DEVFSADM_TERMINATE);
-	}
-
-	if (di_prop_lookup_ints(DDI_DEV_T_ANY, node, "socket", &intp) <= 0) {
-		devfsadm_errprint("%s: failed pcmcia socket lookup\n\t%s\n",
-		    modname, devfspath);
-		di_devfs_path_free(devfspath);
-		return (DEVFSADM_TERMINATE);
-	}
-
-	socket = PCMCIA_SOCKETNO(*intp);
-
-	di_devfs_path_free(devfspath);
-
-	(void) sprintf(l_path, "term/pc%d", socket);
-	(void) devfsadm_mklink(l_path, node, minor, 0);
-
-	return (DEVFSADM_TERMINATE);
-}
-
-/*
- * PCMCIA dialout serial ports
- * Creates links of the form "/dev/cua/pcN", where N is the PCMCIA
- * socket number the device is plugged into.
- */
-static int
-pcmcia_dialout_create(di_minor_t minor, di_node_t node)
-{
-	char l_path[MAXPATHLEN];
-	char  *devfspath;
-	int socket, *intp;
-
-	devfspath = di_devfs_path(node);
-	if (devfspath == NULL) {
-		devfsadm_errprint("%s: di_devfs_path() failed\n", modname);
-		return (DEVFSADM_TERMINATE);
-	}
-
-	if (di_prop_lookup_ints(DDI_DEV_T_ANY, node, "socket", &intp) <= 0) {
-		devfsadm_errprint("%s: failed socket lookup\n\t%s\n",
-		    modname, devfspath);
-		di_devfs_path_free(devfspath);
-		return (DEVFSADM_TERMINATE);
-	}
-
-	socket = PCMCIA_SOCKETNO(*intp);
-
-	di_devfs_path_free(devfspath);
-	(void) sprintf(l_path, "cua/pc%d", socket);
-	(void) devfsadm_mklink(l_path, node, minor, 0);
-
-	return (DEVFSADM_TERMINATE);
-}
-
 
 /*
  * Removes port entries that no longer have devices
diff --git a/usr/src/cmd/hal/hald/solaris/devinfo.c b/usr/src/cmd/hal/hald/solaris/devinfo.c
index be12ce2fd6..4600c09224 100644
--- a/usr/src/cmd/hal/hald/solaris/devinfo.c
+++ b/usr/src/cmd/hal/hald/solaris/devinfo.c
@@ -2,6 +2,7 @@
  *
  * devinfo.c : main file for libdevinfo-based device enumeration
  *
+ * Copyright 2013 Garrett D'Amore <garrett@damore.org>
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Academic Free License version 2.1
@@ -131,7 +132,6 @@ static DevinfoDevHandler *devinfo_handlers[] = {
 	&devinfo_cpu_handler,
 	&devinfo_ide_handler,
 	&devinfo_scsi_handler,
-	&devinfo_pcata_handler,
 	&devinfo_blkdev_handler,
 	&devinfo_floppy_handler,
 	&devinfo_usb_handler,
diff --git a/usr/src/cmd/hal/hald/solaris/devinfo_storage.c b/usr/src/cmd/hal/hald/solaris/devinfo_storage.c
index 7a5b1d84aa..0bf1a563dd 100644
--- a/usr/src/cmd/hal/hald/solaris/devinfo_storage.c
+++ b/usr/src/cmd/hal/hald/solaris/devinfo_storage.c
@@ -3,6 +3,7 @@
  * devinfo_storage.c : storage devices
  *
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2013 Garrett D'Amore <garrett@damore.org>
  *
  * Licensed under the Academic Free License version 2.1
  *
@@ -60,8 +61,6 @@ static HalDevice *devinfo_ide_device_add(HalDevice *parent, di_node_t node, char
 static HalDevice *devinfo_ide_storage_add(HalDevice *parent, di_node_t node, char *devfs_path);
 HalDevice *devinfo_scsi_add(HalDevice *parent, di_node_t node, char *devfs_path, char *device_type);
 static HalDevice *devinfo_scsi_storage_add(HalDevice *parent, di_node_t node, char *devfs_path);
-HalDevice *devinfo_pcata_add(HalDevice *parent, di_node_t node, char *devfs_path, char *device_type);
-static HalDevice *devinfo_pcata_storage_add(HalDevice *parent, di_node_t node, char *devfs_path);
 HalDevice *devinfo_blkdev_add(HalDevice *parent, di_node_t node, char *devfs_path, char *device_type);
 static HalDevice *devinfo_blkdev_storage_add(HalDevice *parent, di_node_t node, char *devfs_path);
 HalDevice *devinfo_floppy_add(HalDevice *parent, di_node_t node, char *devfs_path, char *device_type);
@@ -103,14 +102,6 @@ DevinfoDevHandler devinfo_scsi_handler = {
 	NULL,
         NULL
 };
-DevinfoDevHandler devinfo_pcata_handler = {
-        devinfo_pcata_add,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-        NULL
-};
 DevinfoDevHandler devinfo_blkdev_handler = {
         devinfo_blkdev_add,
 	NULL,
@@ -375,73 +366,6 @@ devinfo_scsi_dtype2str(int dtype)
 
 }
 
-/* PCMCIA */
-
-HalDevice *
-devinfo_pcata_add(HalDevice *parent, di_node_t node, char *devfs_path, char *device_type)
-{
-	int	*i;
-	char	*driver_name;
-	HalDevice *d;
-	char	udi[HAL_PATH_MAX];
-
-	driver_name = di_driver_name (node);
-	if ((driver_name == NULL) || (strcmp (driver_name, "pcata") != 0)) {
-		return (NULL);
-	}
-
-	d = hal_device_new ();
-
-	devinfo_set_default_properties (d, parent, node, devfs_path);
-	hal_device_property_set_string (d, "info.subsystem", "pcmcia");
-
-        hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
-                "%s/%s%d", hal_device_get_udi (parent), di_node_name(node), di_instance (node));
-        hal_device_set_udi (d, udi);
-        hal_device_property_set_string (d, "info.udi", udi);
-        hal_device_property_set_string (d, "info.product", "PCMCIA Disk");
-
-        devinfo_add_enqueue (d, devfs_path, &devinfo_pcata_handler);
-
-        return (devinfo_pcata_storage_add (d, node, devfs_path));
-}
-
-static HalDevice *
-devinfo_pcata_storage_add(HalDevice *parent, di_node_t node, char *devfs_path)
-{
-	HalDevice *d;
-	char	*driver_name;
-	int	*i;
-	char	*s;
-	char	udi[HAL_PATH_MAX];
-
-	d = hal_device_new ();
-
-	devinfo_set_default_properties (d, parent, node, devfs_path);
-	hal_device_property_set_string (d, "info.category", "storage");
-
-	hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
-		"%s/sd%d", hal_device_get_udi (parent), di_instance (node));
-	hal_device_set_udi (d, udi);
-	hal_device_property_set_string (d, "info.udi", udi);
-
-	hal_device_add_capability (d, "storage");
-
-	hal_device_property_set_int (d, "storage.lun", 0);
-	hal_device_property_set_bool (d, "storage.hotpluggable", TRUE);
-	hal_device_property_set_bool (d, "storage.removable", FALSE);
-	hal_device_property_set_bool (d, "storage.requires_eject", FALSE);
-	hal_device_property_set_bool (d, "storage.media_check_enabled", TRUE);
-       	hal_device_property_set_string (d, "storage.drive_type", "disk");
-	hal_device_property_set_bool (d, "storage.requires_eject", FALSE);
-
-	hal_device_add_capability (d, "block");
-
-	devinfo_storage_minors (d, node, devfs_path, FALSE);
-
-	return (d);
-}
-
 /* blkdev */
 
 HalDevice *
diff --git a/usr/src/cmd/netadm/iu.ap.sh b/usr/src/cmd/netadm/iu.ap.sh
index df73f30fae..9ac9b143d4 100644
--- a/usr/src/cmd/netadm/iu.ap.sh
+++ b/usr/src/cmd/netadm/iu.ap.sh
@@ -44,7 +44,6 @@ case "$MACH" in
 	usbftdi	-1	0	ldterm ttcompat
 	ipsecesp -1	0	ipsecesp
 	ipsecah	-1	0	ipsecah
-	pcser	0	255	ldterm ttcompat
 " > iu.ap
 	;;
   "sparc" )
@@ -77,7 +76,6 @@ case "$MACH" in
 	ipsecesp -1	0	ipsecesp
 	ipsecah	-1	0	ipsecah
 	oplmsu	0	0	ldterm ttcompat
-	pcser	0	255	ldterm ttcompat
 " >iu.ap
 	;;
   * )