diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/pkgdefs/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWhea/prototype_com | 4 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWpcelx/Makefile | 18 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWpcelx/depend | 33 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWpcelx/pkginfo.tmpl | 38 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWpcelx/postinstall | 22 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWpcelx/preremove | 15 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWpcelx/prototype_com | 27 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWpcelx/prototype_i386 | 30 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWpcelx/prototype_sparc | 25 | ||||
| -rw-r--r-- | usr/src/pkgdefs/common_files/i.minorperm_sparc | 8 | ||||
| -rw-r--r-- | usr/src/tools/scripts/bfu.sh | 11 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/pcmcia/pcgld.h | 410 | ||||
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel.shared | 1 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/minor_perm | 2 | ||||
| -rw-r--r-- | usr/src/uts/sparc/Makefile.sparc.shared | 1 | ||||
| -rw-r--r-- | usr/src/uts/sparc/os/minor_perm | 2 |
18 files changed, 13 insertions, 638 deletions
diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile index 690a0935a9..218c7c8496 100644 --- a/usr/src/pkgdefs/Makefile +++ b/usr/src/pkgdefs/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -381,7 +381,6 @@ COMMON_SUBDIRS= \ SUNWpacketu \ SUNWpapi \ SUNWpcan \ - SUNWpcelx \ SUNWpcmci \ SUNWpcser \ SUNWpcu \ diff --git a/usr/src/pkgdefs/SUNWhea/prototype_com b/usr/src/pkgdefs/SUNWhea/prototype_com index 88ab8b3f20..ff5fb54178 100644 --- a/usr/src/pkgdefs/SUNWhea/prototype_com +++ b/usr/src/pkgdefs/SUNWhea/prototype_com @@ -20,7 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # This required package information file contains a list of package contents. @@ -1105,8 +1105,6 @@ f none usr/include/sys/pci.h 644 root bin f none usr/include/sys/pcie.h 644 root bin d none usr/include/sys/pcmcia 755 root bin f none usr/include/sys/pcmcia/pcata.h 644 root bin -f none usr/include/sys/pcmcia/pcelx.h 644 root bin -f none usr/include/sys/pcmcia/pcgld.h 644 root bin f none usr/include/sys/pcmcia/pcser_conf.h 644 root bin f none usr/include/sys/pcmcia/pcser_io.h 644 root bin f none usr/include/sys/pcmcia/pcser_manuspec.h 644 root bin diff --git a/usr/src/pkgdefs/SUNWpcelx/Makefile b/usr/src/pkgdefs/SUNWpcelx/Makefile deleted file mode 100644 index ffd1b275e2..0000000000 --- a/usr/src/pkgdefs/SUNWpcelx/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -LICENSEFILES += $(OSBL) -CDDL= - -.KEEP_STATE: - -all: $(FILES) -install: all pkg - -include ../Makefile.targ diff --git a/usr/src/pkgdefs/SUNWpcelx/depend b/usr/src/pkgdefs/SUNWpcelx/depend deleted file mode 100644 index 80d07aafc2..0000000000 --- a/usr/src/pkgdefs/SUNWpcelx/depend +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# -# This package information file defines software dependencies associated -# with the pkg. You can define three types of pkg dependencies with this file: -# P indicates a prerequisite for installation -# I indicates an incompatible package -# R indicates a reverse dependency -# <pkg.abbr> see pkginfo(4), PKG parameter -# <name> see pkginfo(4), NAME parameter -# <version> see pkginfo(4), VERSION parameter -# <arch> see pkginfo(4), ARCH parameter -# <type> <pkg.abbr> <name> -# (<arch>)<version> -# (<arch>)<version> -# ... -# <type> <pkg.abbr> <name> -# ... -# - -P SUNWcar Core Architecture, (Root) -P SUNWcakr Core Solaris Kernel Architecture (Root) -P SUNWkvm Core Architecture, (Kvm) -P SUNWcsr Core Solaris, (Root) -P SUNWckr Core Solaris Kernel (Root) -P SUNWcnetr Core Solaris Network Infrastructure (Root) -P SUNWcsu Core Solaris, (Usr) -P SUNWcsd Core Solaris Devices -P SUNWcsl Core Solaris Libraries -P SUNWcslr Core Solaris Libraries (Root) -P SUNWpcmci PCMCIA Card Services and kernel code diff --git a/usr/src/pkgdefs/SUNWpcelx/pkginfo.tmpl b/usr/src/pkgdefs/SUNWpcelx/pkginfo.tmpl deleted file mode 100644 index f08ff0cabd..0000000000 --- a/usr/src/pkgdefs/SUNWpcelx/pkginfo.tmpl +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -# -# This required package information file describes characteristics of the -# package, such as package abbreviation, full package name, package version, -# and package architecture. -# -PKG="SUNWpcelx" -NAME="3COM EtherLink III PCMCIA Ethernet Driver" -ARCH="ISA" -VERSION="ONVERS,REV=0.0.0" -SUNW_PRODNAME="PCMCIA-SW" -SUNW_PRODVERS="RELEASE/VERSION" -SUNW_PKGVERS="1.0" -SUNW_PKGTYPE="root" -MAXINST="1000" -CATEGORY="system" -DESC="3COM EtherLink III PCMCIA Ethernet Driver" -VENDOR="Sun Microsystems, Inc." -HOTLINE="Please contact your local service provider" -EMAIL="" -CLASSES="none" -BASEDIR=/ -SUNW_PKG_ALLZONES="true" -SUNW_PKG_HOLLOW="true" -SUNW_PKG_THISZONE="false" -#VSTOCK="<reserved by Release Engineering for package part #>" -#ISTATES="<developer defined>" -#RSTATES='<developer defined>' -#ULIMIT="<developer defined>" -#ORDER="<developer defined>" -#PSTAMP="<developer defined>" -#INTONLY="<developer defined>" diff --git a/usr/src/pkgdefs/SUNWpcelx/postinstall b/usr/src/pkgdefs/SUNWpcelx/postinstall deleted file mode 100644 index d83f23c1f1..0000000000 --- a/usr/src/pkgdefs/SUNWpcelx/postinstall +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh -# -# ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -PATH="/bin:/usr/bin:/usr/sbin:${PATH}" -export PATH - -EXIT=0 - -grep '^pcelx\>' ${BASEDIR}/etc/name_to_major > /dev/null && \ -rem_drv -b ${BASEDIR} pcelx -add_drv -b ${BASEDIR} -n -m '* 0666 root sys' \ --i '"pccard101,556" "pccard101,574" "pccard101,589" "pccard101,562,0"' pcelx \ -|| EXIT=1 -echo 'pcelx:* read_priv_set=net_rawaccess write_priv_set=net_rawaccess' >> \ - ${BASEDIR}/etc/security/device_policy - -exit ${EXIT} diff --git a/usr/src/pkgdefs/SUNWpcelx/preremove b/usr/src/pkgdefs/SUNWpcelx/preremove deleted file mode 100644 index 433dd66d12..0000000000 --- a/usr/src/pkgdefs/SUNWpcelx/preremove +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/sh -# -# ident "%Z%%M% %I% %E% SMI" -# -# Copyright (c) 1999 by Sun Microsystems, Inc. -# All rights reserved. -# - -PATH="/bin:/usr/bin:/usr/sbin:${PATH}" -export PATH - -rem_drv -b ${BASEDIR} pcelx -rm -f ${BASEDIR}/dev/pcelx* - -exit 0 diff --git a/usr/src/pkgdefs/SUNWpcelx/prototype_com b/usr/src/pkgdefs/SUNWpcelx/prototype_com deleted file mode 100644 index ee2fda3b56..0000000000 --- a/usr/src/pkgdefs/SUNWpcelx/prototype_com +++ /dev/null @@ -1,27 +0,0 @@ -# ident "%Z%%M% %I% %E% SMI" -# -# Copyright 1999,2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# This required package information file contains a list of package contents. -# The 'pkgmk' command uses this file to identify the contents of a package -# and their location on the development machine when building the package. -# Can be created via a text editor or through use of the 'pkgproto' command. - -#!search <pathname pathname ...> # where to find pkg objects -#!include <filename> # include another 'prototype' file -#!default <mode> <owner> <group> # default used if not specified on entry -#!<param>=<value> # puts parameter in pkg environment - -i pkginfo -i copyright -i depend -i postinstall -i preremove -# -# source locations relative to the prototype file -# -# SUNWpcelx -# -d none kernel 0755 root sys -d none kernel/drv 0755 root sys diff --git a/usr/src/pkgdefs/SUNWpcelx/prototype_i386 b/usr/src/pkgdefs/SUNWpcelx/prototype_i386 deleted file mode 100644 index 2f680a339f..0000000000 --- a/usr/src/pkgdefs/SUNWpcelx/prototype_i386 +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# -# This required package information file contains a list of package contents. -# The 'pkgmk' command uses this file to identify the contents of a package -# and their location on the development machine when building the package. -# Can be created via a text editor or through use of the 'pkgproto' command. - -#!search <pathname pathname ...> # where to find pkg objects -#!include <filename> # include another 'prototype' file -#!default <mode> <owner> <group> # default used if not specified on entry -#!<param>=<value> # puts parameter in pkg environment - -# -# Include ISA independent files (prototype_com) -# -!include prototype_com -# -# -# -# List files which are i386 specific here -# -# SUNWpcelx -# -f none kernel/drv/pcelx 0755 root sys -d none kernel/drv/amd64 0755 root sys -f none kernel/drv/amd64/pcelx 0755 root sys diff --git a/usr/src/pkgdefs/SUNWpcelx/prototype_sparc b/usr/src/pkgdefs/SUNWpcelx/prototype_sparc deleted file mode 100644 index 380a7cbbbf..0000000000 --- a/usr/src/pkgdefs/SUNWpcelx/prototype_sparc +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2001,2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# This required package information file contains a list of package contents. -# The 'pkgmk' command uses this file to identify the contents of a package -# and their location on the development machine when building the package. -# Can be created via a text editor or through use of the 'pkgproto' command. - -#!search <pathname pathname ...> # where to find pkg objects -#!include <filename> # include another 'prototype' file -#!default <mode> <owner> <group> # default used if not specified on entry -#!<param>=<value> # puts parameter in pkg environment - -# -# Include ISA independent files (prototype_com) -# -!include prototype_com -# -# -# -# List files which are sparc specific here -d none kernel/drv/sparcv9 0755 root sys -f none kernel/drv/sparcv9/pcelx 0755 root sys diff --git a/usr/src/pkgdefs/common_files/i.minorperm_sparc b/usr/src/pkgdefs/common_files/i.minorperm_sparc index be5d16c7c3..afaed4d462 100644 --- a/usr/src/pkgdefs/common_files/i.minorperm_sparc +++ b/usr/src/pkgdefs/common_files/i.minorperm_sparc @@ -21,7 +21,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -123,8 +123,6 @@ pcwl:* 0600 root sys 0666 root sys /dev/pcwl* pcan:* 0600 root sys 0666 root sys /dev/pcan* clone:dmfe 0600 root sys 0666 root sys /dev/dmfe dmfe:* 0600 root sys 0666 root sys /dev/dmfe* -clone:pcelx 0600 root sys 0666 root sys /dev/pcelx -pcelx:* 0600 root sys 0666 root sys /dev/pcelx* afe:* 0600 root sys 0666 root sys /dev/afe* mxfe:* 0600 root sys 0666 root sys /dev/mxfe* rtls:* 0600 root sys 0666 root sys /dev/rtls* @@ -182,6 +180,7 @@ clone:ipsecah clone:ipsecesp clone:keysock clone:le +clone:pcelx su:* profile:profile clone:qe @@ -194,6 +193,7 @@ dbri:* SUNW,DBRId:* SUNW,DBRIe:* SUNW,DBRIf:* +pcelx:* vni:* EOF } @@ -313,8 +313,6 @@ mxfe:* rtls:* clone:dmfe dmfe:* -clone:pcelx -pcelx:* clone:ibd ibd:* sysevent:* diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh index 47050d37dd..d888812679 100644 --- a/usr/src/tools/scripts/bfu.sh +++ b/usr/src/tools/scripts/bfu.sh @@ -6924,7 +6924,6 @@ mondo_loop() { $root/kernel/drv/openeepr \ $root/kernel/drv/options \ $root/kernel/drv/pcata \ - $root/kernel/drv/pcelx \ $root/kernel/drv/pcic \ $root/kernel/drv/pcmem \ $root/kernel/drv/pcram \ @@ -7599,6 +7598,14 @@ mondo_loop() { rm -f $root/kernel/mach/corollary # + # Remove driver for EOF of pcelx as per PSARC 2009/662 + # + rm -f $root/kernel/drv/pcelx + rm -f $root/kernel/drv/amd64/pcelx + rm -f $usr/include/sys/pcmcia/pcgld.h + rm -f $usr/include/sys/pcmcia/pcelx.h + + # # Remove eisa nexus driver and header files for EOF of EISA # support as per PSARC/2003/650 # @@ -8653,8 +8660,6 @@ mondo_loop() { bge:* bge* clone:dmfe dmfe dmfe:* dmfe* - clone:pcelx pcelx - pcelx:* pcelx* clone:dnet dnet dnet:* dnet* clone:elxl elxl diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile index 24de2a1df9..e251fd3222 100644 --- a/usr/src/uts/common/sys/Makefile +++ b/usr/src/uts/common/sys/Makefile @@ -848,7 +848,6 @@ FSHDRS= \ PCMCIAHDRS= \ pcata.h \ - pcgld.h \ pcser_conf.h \ pcser_io.h \ pcser_reg.h \ diff --git a/usr/src/uts/common/sys/pcmcia/pcgld.h b/usr/src/uts/common/sys/pcmcia/pcgld.h deleted file mode 100644 index 68af3d03a2..0000000000 --- a/usr/src/uts/common/sys/pcmcia/pcgld.h +++ /dev/null @@ -1,410 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Warning - This file is not an approved Public Interface. - * It may change or disappear at any time. - */ - -/* - * gld - a generic LAN driver support system for drivers using the DLPI - * interface. - * - * Copyrighted as an unpublished work. (c) Copyright 1992 Sun Microsystems, Inc. - * All rights reserved. - */ - -#ifndef _SYS_PCMCIA_PCGLD_H -#define _SYS_PCMCIA_PCGLD_H - -#pragma ident "%Z%%M% %I% %E% SMI" - - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * structure for driver statistics - */ -struct gld_stats { - uint32_t glds_multixmt; - uint32_t glds_multircv; /* multicast but not broadcast */ - uint32_t glds_brdcstxmt; - uint32_t glds_brdcstrcv; - uint32_t glds_blocked; /* discard due to upstream being flow */ - /* controlled */ - uint32_t glds_pktxmt; - uint32_t glds_pktrcv; - uint32_t glds_bytexmt; - uint32_t glds_bytercv; - uint32_t glds_errxmt; - uint32_t glds_errrcv; - uint32_t glds_collisions; - uint32_t glds_excoll; - uint32_t glds_defer; - uint32_t glds_frame; - uint32_t glds_crc; - uint32_t glds_overflow; - uint32_t glds_underflow; - uint32_t glds_short; - uint32_t glds_missed; - uint32_t glds_xmtlatecoll; - uint32_t glds_nocarrier; - uint32_t glds_noxmtbuf; - uint32_t glds_norcvbuf; - uint32_t glds_intr; - uint32_t glds_xmtretry; -}; - -/* - * structure for names stat structure usage as required by "netstat" - */ -struct gldkstats { - kstat_named_t glds_pktxmt; - kstat_named_t glds_pktrcv; - kstat_named_t glds_errxmt; - kstat_named_t glds_errrcv; - kstat_named_t glds_collisions; - kstat_named_t glds_bytexmt; - kstat_named_t glds_bytercv; - kstat_named_t glds_multixmt; - kstat_named_t glds_multircv; /* multicast but not broadcast */ - kstat_named_t glds_brdcstxmt; - kstat_named_t glds_brdcstrcv; - kstat_named_t glds_blocked; /* discard due to upstream flow */ - /* control */ - kstat_named_t glds_excoll; - kstat_named_t glds_defer; - kstat_named_t glds_frame; - kstat_named_t glds_crc; - kstat_named_t glds_overflow; - kstat_named_t glds_underflow; - kstat_named_t glds_short; - kstat_named_t glds_missed; - kstat_named_t glds_xmtlatecoll; - kstat_named_t glds_nocarrier; - kstat_named_t glds_noxmtbuf; - kstat_named_t glds_norcvbuf; - kstat_named_t glds_intr; - kstat_named_t glds_xmtretry; -}; - -/* multicast structures */ -typedef struct gld_multicast_addr { - int gldm_refcnt; /* number of streams referring */ - /* to entry */ - unsigned char gldm_addr[ETHERADDRL]; -} gld_mcast_t; -#define GLD_MAX_MULTICAST 16 /* default max multicast table size */ - -/* - * gld_mac_info structure. Used to define the per-board data for all - * drivers. - */ -typedef -struct gld_mac_info { - struct gld_mac_info *gldm_next, *gldm_prev; /* GLD PRIVATE */ - struct gld *gldm_last; /* last scheduled stream -- GLD */ - /* PRIVATE */ - struct glddevice *gldm_dev; /* pointer to device base -- GLD */ - /* PRIVATE */ - int32_t gldm_version; /* Currently UNUSED, must be zero */ - int32_t gldm_GLD_flags; /* GLD PRIVATE */ - dev_info_t *gldm_devinfo; /* SET BY GLD, DRIVER MAY USE */ - mblk_t *gldm_rcvq; - /* UNUSED */ - kmutex_t gldm_intrlock; - kmutex_t gldm_maclock; /* SET BY GLD, DRIVER MAY USE */ - ddi_iblock_cookie_t gldm_cookie; /* SET BY GLD, DRIVER MAY USE */ - int32_t gldm_flags; /* PRIVATE TO DRIVER */ - int32_t gldm_state; /* PRIVATE TO DRIVER */ - int32_t gldm_maxpkt; - int32_t gldm_minpkt; - char *gldm_ident; - int32_t gldm_type; - uint32_t gldm_media; - int32_t gldm_addrlen; /* usually 6 but could be 2 */ - int32_t gldm_saplen; - unsigned char gldm_macaddr[ETHERADDRL]; - unsigned char gldm_vendor[ETHERADDRL]; - unsigned char gldm_broadcast[ETHERADDRL]; - int gldm_ppa; /* PPA number -- GLD PRIVATE */ - off_t gldm_reg_offset; /* used to find base of real */ - /* shared ram */ - int32_t gldm_nstreams; /* GLD PRIVATE */ - int32_t gldm_nprom; /* num streams in promiscuous */ - /* mode--GLD PRIVATE */ - acc_handle_t gldm_port; /* I/O port address -- PRIVATE TO */ - /* DRIVER */ - acc_handle_t gldm_portdata; /* I/O port address -- PRIVATE TO */ - caddr_t gldm_memp; /* SET BY GLD, DRIVER MAY USE */ - int32_t gldm_reg_index; /* SET BY DRIVER FOR GLD TO USE */ - off_t gldm_reg_len; /* used to specify length of RAM */ - int32_t gldm_irq_index; /* SET BY DRIVER FOR GLD TO USE */ - uint32_t gldm_options; /* Identify features to use */ - gld_mcast_t *gldm_mcast; /* per device multicast table -- GLD */ - /* PRIVATE */ - struct gld_stats gldm_stats; - - struct gldkstats gldm_kstats; /* GLD PRIVATE */ - kstat_t *gldm_kstatp; /* GLD PRIVATE */ - caddr_t gldm_private; /* board private data -- PRIVATE TO */ - /* DRIVER */ - int (*gldm_reset)(); /* reset procedure */ - int (*gldm_start)(); /* start board */ - int (*gldm_stop)(); /* stop board completely */ - int (*gldm_saddr)(); /* set physical address */ - int (*gldm_send)(); /* transmit procedure */ - int (*gldm_prom)(); /* set promiscuous mode */ - int (*gldm_gstat)(); /* get board statistics */ - int (*gldm_ioctl)(); /* Driver specific ioctls */ - int (*gldm_sdmulti)(); /* set/delete multicast */ - /* address */ - uint32_t (*gldm_intr)(); /* interrupt handler */ - uint32_t (*gldm_intr_hi)(); /* inform driver of event */ - ddi_softintr_t gldm_softid; /* soft intr trigger */ -} gld_mac_info_t; - -/* gldm_GLD_flags */ -#define GLD_INTR_READY 0x0001 /* safe to call interrupt routine */ -#define GLD_INTR_HI 0x0002 /* using above lock level handler */ -#define GLD_DEV_PRESENT 0x0004 /* removable device is present */ -#define GLD_INTR_SOFT 0x0008 /* soft handler installed */ - -/* flags for mac info (hardware) status */ -#define GLD_PROMISC 0x0010 /* hardware is in promiscous mode */ -#define GLD_IN_INTR 0x0020 /* in the interrupt mutex area */ - -/* PPA number mask */ -#define GLD_PPA_MASK 0x3f -#define GLD_PPA_INIT 0x40 -#define GLD_USE_STYLE2 0 - -/* GLD Options */ -#define GLDOPT_PCMCIA 0x0001 /* PCMCIA details */ -#define GLDOPT_DRIVER_PPA 0x0002 /* driver defines PPA */ - -/* - * gld structure. Used to define the per-stream information required to - * implement DLPI. - */ -typedef struct gld { - struct gld *gld_next, *gld_prev; - mblk_t *gld_mb; - int32_t gld_state; - int32_t gld_style; - int32_t gld_minor; - int32_t gld_type; - int32_t gld_sap; - int32_t gld_flags; /* flags used for controlling things */ - int32_t gld_multicnt; /* number of multicast addresses for */ - /* stream */ - gld_mcast_t **gld_mcast; /* multicast table if multicast is */ - /* enabled */ - queue_t *gld_qptr; - kmutex_t gld_lock; - struct gld_mac_info *gld_mac_info; - struct gld_stats *gld_stats; - struct glddevice *gld_device; -} gld_t; - -/* gld_flag bits */ -#define GLD_RAW 0x0001 /* lower stream is in RAW mode */ -#define GLD_FAST 0x0002 /* use "fast" path */ -#define GLD_PROM_PHYS 0x0004 /* stream is in physical promiscuous mode */ -#define GLD_PROM_SAP 0x0008 -#define GLD_PROM_MULT 0x0010 -#define GLD_XWAIT 0x0020 /* waiting for transmitter */ -#define GLD_LOCKED 0x0040 /* queue is locked (mutex) */ - -/* special case SAP values */ -#define GLD_802_SAP 1500 -#define GLDMAXETHERSAP 0xFFFF -#define GLD_MAX_802_SAP 0xFF - -/* - * media type This identifies the media/connector used by the LAN type of the - * driver. Possible types will be defined per the DLPI type defined in - * gldm_type - */ -/* if driver cannot determine media/connector type */ -#define GLDM_UNKNOWN 0 - -/* DL_ETHER/DL_CSMACD */ -#define GLDM_AUI 1 -#define GLDM_BNC 2 -#define GLDM_TP 3 -#define GLDM_FIBER 4 - -/* - * definitions for the per driver class structure - */ -typedef struct glddevice { - struct glddevice *gld_next, *gld_prev; - char gld_name[16]; /* name of device */ - int gld_status; - krwlock_t gld_rwlock; /* used to serialize read/write locks */ - int gld_minors; - int gld_major; - int gld_multisize; - int gld_type; /* for use before attach */ - int gld_minsdu; - int gld_maxsdu; - gld_mac_info_t *gld_mac_next, *gld_mac_prev; /* the various mac */ - /* layers */ - int gld_ndevice; /* number of devices linked */ - int gld_nextppa; /* number to use for next PPA default */ - gld_t *gld_str_next, *gld_str_prev; /* open streams */ -} glddev_t; - -#define GLD_ATTACHED 0x0001 /* board is attached so mutexes are */ - /* initialized */ - - -/* - * definitions for debug tracing - */ -#ifdef DEBUG -#define GLD_DEBUG 1 -#endif -#define GLDTRACE 0x0001 /* basic procedure level tracing */ -#define GLDERRS 0x0002 /* trace errors */ -#define GLDRECV 0x0004 /* trace receive path */ -#define GLDSEND 0x0008 /* trace send path */ -#define GLDPROT 0x0010 /* trace DLPI protocol */ - -/* - * other definitions - */ -#define GLDE_OK -1 /* internal procedure status is OK */ -#define GLDE_NOBUFFER 0x1001 /* couldn't allocate a buffer */ -#define GLDE_RETRY 0x1002 /* want to retry later */ - - -/* - * definitions for module_info - */ -#define GLDIDNUM 0x8020 - -#define ismulticast(cp) ((*(caddr_t)(cp)) & 0x01) - -/* define structure for DLSAP value parsing */ -struct gld_dlsap { - unsigned char glda_addr[ETHERADDRL]; - unsigned short glda_sap; -}; - -#define DLSAP(p, offset) ((struct gld_dlsap *)((caddr_t)(p)+offset)) - -/* union used in calculating hash values */ -union gldhash { - uint32_t value; - struct { - unsigned a0:1; - unsigned a1:1; - unsigned a2:1; - unsigned a3:1; - unsigned a4:1; - unsigned a5:1; - unsigned a6:1; - unsigned a7:1; - unsigned a8:1; - unsigned a9:1; - unsigned a10:1; - unsigned a11:1; - unsigned a12:1; - unsigned a13:1; - unsigned a14:1; - unsigned a15:1; - unsigned a16:1; - unsigned a17:1; - unsigned a18:1; - unsigned a19:1; - unsigned a20:1; - unsigned a21:1; - unsigned a22:1; - unsigned a23:1; - unsigned a24:1; - unsigned a25:1; - unsigned a26:1; - unsigned a27:1; - unsigned a28:1; - unsigned a29:1; - unsigned a30:1; - unsigned a31:1; - } bits; -}; - -/* - * new interface to allow informing of status changes with hardware - * via the gld_status_change() function - */ -#define GLDSTAT_INSERT 1 /* device just inserted */ -#define GLDSTAT_REMOVE 2 /* device just removed */ - -/* - * miscellaneous linkage glue - */ -#define DEPENDS_ON_GLD char _depends_on[] = "misc/gld" - -/* - * defines to make porting older ISC LLC drivers to GLD easier - */ -#define llcp_int gldm_irq -#define LLC_ADDR_LEN ETHERADDRL -#define GLD_EHDR_SIZE sizeof (struct ether_header) -#define LOW(x) ((x)&0xFF) -#define HIGH(x) (((x)>>8)&0xFF) - -#if defined(_KERNEL) -extern int pcgld_open(queue_t *q, dev_t *dev, int flag, int sflag, - cred_t *cred); -extern int pcgld_close(queue_t *q, int flag, cred_t *cred); -extern int pcgld_wput(queue_t *q, mblk_t *mp); -extern int pcgld_wsrv(queue_t *q); -extern int pcgld_rsrv(queue_t *q); -extern int pcgld_ioctl(queue_t *q, mblk_t *mp); -extern int pcgld_recv(gld_mac_info_t *macinfo, mblk_t *mp); -extern int pcgld_register(dev_info_t *, char *, gld_mac_info_t *); -extern int pcgld_unregister(gld_mac_info_t *); -extern uchar_t pcgldbroadcastaddr[]; -extern uint32_t pcgldcrc32(uchar_t *); -#endif - -/* - * EISA support functions - */ - -#define gldnvm(ptr) ((NVM_SLOTINFO *)ptr) -#define gld_boardid(nvm) (*(ushort_t *)(gldnvm(nvm)->boardid)) -#define gld_check_boardid(nvm, id) (gld_boardid(nvm) == id) - -#ifdef __cplusplus -} -#endif - -#endif /* _SYS_PCMCIA_PCGLD_H */ diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared index f97edbc07e..91fcd94175 100644 --- a/usr/src/uts/intel/Makefile.intel.shared +++ b/usr/src/uts/intel/Makefile.intel.shared @@ -457,7 +457,6 @@ DRV_KMODS += iscsi DRV_KMODS += pcs DRV_KMODS += pcata MISC_KMODS += cardbus -$(CLOSED_BUILD)CLOSED_DRV_KMODS += pcelx $(CLOSED_BUILD)CLOSED_DRV_KMODS += pcser # diff --git a/usr/src/uts/intel/os/minor_perm b/usr/src/uts/intel/os/minor_perm index 44e613c0a3..e33ab16a73 100644 --- a/usr/src/uts/intel/os/minor_perm +++ b/usr/src/uts/intel/os/minor_perm @@ -7,8 +7,6 @@ clone:ibd 0666 root sys ibd:* 0666 root sys clone:iprb 0666 root sys iprb:* 0666 root sys -clone:pcelx 0666 root sys -pcelx:* 0666 root sys clone:spwr 0666 root sys spwr:* 0666 root sys icmp:icmp 0666 root sys diff --git a/usr/src/uts/sparc/Makefile.sparc.shared b/usr/src/uts/sparc/Makefile.sparc.shared index 80a6f8010b..595af14c8a 100644 --- a/usr/src/uts/sparc/Makefile.sparc.shared +++ b/usr/src/uts/sparc/Makefile.sparc.shared @@ -343,7 +343,6 @@ MISC_KMODS += busra cardbus dada pcmcia DRV_KMODS += pcata DRV_KMODS += pcic -$(CLOSED_BUILD)CLOSED_DRV_KMODS += pcelx $(CLOSED_BUILD)CLOSED_DRV_KMODS += pcser # Add lvm diff --git a/usr/src/uts/sparc/os/minor_perm b/usr/src/uts/sparc/os/minor_perm index b80a9ea312..4f78a4cbd2 100644 --- a/usr/src/uts/sparc/os/minor_perm +++ b/usr/src/uts/sparc/os/minor_perm @@ -1,8 +1,6 @@ audio:* 0600 root sys clone:dmfe 0666 root sys dmfe:* 0666 root sys -clone:pcelx 0666 root sys -pcelx:* 0666 root sys clone:ibd 0666 root sys ibd:* 0666 root sys clone:eri 0666 root sys |