1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

pcmcia-cs: drop as we use pcmciautils for all PCMCIA machines

Pcmcia-cs is needed for kernels older then 2.6.13-rc1 and all Poky targets 
use newer versions.


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2976 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2007-10-25 15:23:08 +00:00
parent 8cd7a0e4f4
commit 6de1eeaa11
16 changed files with 0 additions and 618 deletions
-40
View File
@@ -1,40 +0,0 @@
module_id() {
awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
}
case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </proc/cpuinfo` in
*XScale-PXA2*)
case "`uname -r`" in
2.4*)
PCIC=pxa_cs
;;
2.6*)
PCIC=pxa2xx_core
;;
esac
;;
*StrongARM-1100* | *StrongARM-1110*)
PCIC=sa1100_cs
;;
*)
echo "Unable to determine PCIC value for this CPU"
exit 1
;;
esac
case "`uname -r`" in
2.4*)
DS=ds
;;
2.6*)
DS=pcmcia
;;
esac
case `module_id` in
"HP iPAQ H3"* | "HP iPAQ H5"*)
PCIC_EXTRA=h3600_generic_sleeve
;;
esac
@@ -1,26 +0,0 @@
Index: pcmcia-cs-3.2.8/debug-tools/lspnp.c
===================================================================
--- pcmcia-cs-3.2.8.orig/debug-tools/lspnp.c 2002-02-13 05:45:01.000000000 +0000
+++ pcmcia-cs-3.2.8/debug-tools/lspnp.c 2005-11-11 23:43:33.000000000 +0000
@@ -496,7 +496,7 @@
dump_io_fixed(r); break;
}
}
- (u_char *)p += sz + 1;
+ p = (union pnp_resource *) ((u_char *)p + sz + 1);
}
return (u_char *)p;
}
Index: pcmcia-cs-3.2.8/debug-tools/setpnp.c
===================================================================
--- pcmcia-cs-3.2.8.orig/debug-tools/setpnp.c 2001-10-10 02:58:12.000000000 +0000
+++ pcmcia-cs-3.2.8/debug-tools/setpnp.c 2005-11-11 23:44:32.000000000 +0000
@@ -163,7 +163,7 @@
break;
}
}
- (u_char *)p += sz + 1;
+ p = (union pnp_resource *) ((u_char *)p + sz + 1);
}
return (u_char *)p;
}
@@ -1,13 +0,0 @@
card "TRENDnet TE-CF100"
manfid 0x0149, 0xc1ab
version "Fast Ethernet", "CF Size PC Card", "1.0"
bind "pcnet_cs"
card "Hawking 10/100 CF Fast Ethernet"
manfid 0x0149, 0xc1ab
bind "pcnet_cs"
card "Billionton CFLA-100N 10/100 FastEthernet"
version "CF", "100Base-Ethernet", "V", "1.0"
manfid 0x021b, 0x0202
bind "pcnet_cs"
-1
View File
@@ -1 +0,0 @@
# no defaults for /etc/sysconfig/pcmcia
-14
View File
@@ -1,14 +0,0 @@
device "wnv_cs"
module "wnv_cs"
#
# Winnov PCMCIA Camera
#
card "Winnov VideumMPC Camera"
version "Winnov", "VideumMPC", "Rev 1.0", ""
bind "wnv_cs"
## handhelds.org bugzilla bug 188
card "Winnov VideumCam Traveler"
manfid 0x01a5, 0x0000
bind "wnv_cs"
-19
View File
@@ -1,19 +0,0 @@
--- pcmcia-cs-3.2.8/etc/shared.orig 2004-12-15 02:21:11.000000000 +0100
+++ pcmcia-cs-3.2.8/etc/shared 2004-12-27 17:09:51.000000000 +0100
@@ -55,8 +55,15 @@
fi
if is_true $DO_MOUNT ; then
O=${OPTS:+-o $OPTS} ; FS=${FSTYPE:+-t $FSTYPE}
- log mount $O $FS $1 $MOUNTPT || return 1
+ if test -x /etc/pcmcia/ide_automount
+ then
+ /etc/pcmcia/ide_automount
+ else
+ log mount $O $FS $1 $MOUNTPT || return 1
+ fi
fi
+
+ logger "SHARED [$MOUNTPT] [$1]"
return 0
}
-20
View File
@@ -1,20 +0,0 @@
--- pcmcia-cs-3.2.3/etc/shared~ide 2003-03-11 10:26:14.000000000 -0600
+++ pcmcia-cs-3.2.3/etc/shared 2003-03-11 10:32:39.000000000 -0600
@@ -57,7 +57,7 @@
fi
if is_true $DO_MOUNT ; then
O=${OPTS:+-o $OPTS} ; FS=${FSTYPE:+-t $FSTYPE}
- log mount -v $O $FS $1 $MOUNTPT || return 1
+ log mount $O $FS $1 $MOUNTPT || return 1
fi
return 0
}
@@ -85,7 +85,7 @@
test -b $1 || return 1
do_fuser -k -m $1 > /dev/null
if mount | grep -q "$1 on" ; then
- log umount -v $1 || return 1
+ log umount $1 || return 1
fi
if is_true $DO_FSTAB ; then
grep -v $1 /etc/fstab > /etc/fstab.N
-25
View File
@@ -1,25 +0,0 @@
# ATA/IDE drive adapter configuration
#
# The address format is "scheme,socket,serial_no[,part]".
#
# For multi-partition devices, first return list of partitions in
# $PARTS. Then, we'll get called for each partition.
#
case "$ADDRESS" in
*,*,*,1)
#INFO="Sample IDE setup"
DO_FSTAB="n";
#DO_FSCK="y" ;
DO_MOUNT="y"
#FSTYPE="msdos"
#FSTYPE="auto"
#OPTS=""
#MOUNTPT="/mnt/ide"
;;
*,*,*)
PARTS="1"
# Card eject policy options
NO_CHECK=n
NO_FUSER=y
;;
esac
-92
View File
@@ -1,92 +0,0 @@
--- pcmcia-cs/etc/network.old 2004-07-01 00:31:59.000000000 +0100
+++ pcmcia-cs/etc/network 2004-07-01 00:32:57.000000000 +0100
@@ -31,16 +31,39 @@
RESOLV=/etc/resolv.conf
+# if this interface has an entry in /etc/network/interfaces, let ifupdown
+# handle it
+if grep -q "iface \+$DEVICE" /etc/network/interfaces; then
+ case $ACTION in
+ start)
+ ifup $DEVICE
+ ;;
+ stop)
+ ifdown $DEVICE
+ ;;
+ restart)
+ ifdown $DEVICE
+ ifup $DEVICE
+ ;;
+ esac
+
+ exit 0
+fi
+
+## see if it is a wireless card. Jamey and AntiProxy
+CHECK_WIRELESS=`grep "$DEVICE" /proc/net/wireless`
+if [ -n "$CHECK_WIRELESS" ] ; then
# Now, run the specific script for Wireless LAN interfaces
# Note : we need the wireless parameters to be set up before IP parameters,
# so that we can perform DHCP over the Wireless link if needed. Jean II
-O_INFO=$INFO ; INFO=
-if [ -x ./wireless ] ; then
- . ./wireless
-else
- . /etc/pcmcia/wireless
+ O_INFO=$INFO ; INFO=
+ if [ -x ./wireless ] ; then
+ . ./wireless
+ else
+ . /etc/pcmcia/wireless
+ fi
+ INFO=$O_INFO
fi
-INFO=$O_INFO
bootp_setup ()
{
@@ +225,6 -188,11 @@
fi
/sbin/dhcpcd -XYZZY 2>&1 | grep -q DHCP || \
rm -f /var/run/dhcpcd-$DEVICE.pid
+ # modified for udhcpc
+ elif [ -x /sbin/udhcpc ] ; then
+ PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null`
+ if [ -n "$PID" ] ; then kill -TERM $PID ; fi
+ # end of modification
elif [ -x /sbin/dhclient ] ; then
PID=`cat /var/run/dhclient.pid 2>/dev/null`
if [ -n "$PID" ] ; then kill -TERM $PID ; fi
@@ +282,7 -250,30 @@
[ -n "$IPADDR" ] && /sbin/ifconfig $DEVICE down up
;;
+'resume')
+ #logger RESUME EVENT PCMCIA SEEN FROM CARDMGR
+ if [ -z "$IPADDR" ] || is_true $DHCP ; then
+ if [ ! -x /sbin/dhcpcd ] && [ -x /sbin/udhcpc ] ; then
+ PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null`
+ if [ -n "$PID" ] ; then
+ kill -USR1 $PID
+ fi
+ fi
+ fi
+ ;;
+
+'suspend')
+ #logger SUSPEND EVENT SEEN FROM CARDMGR
+# ## uncomment this code below if you get problems where
+# ## you are getting in IP conflict upon resume on DHCP networks
+# if [ -z "$IPADDR" ] || is_true $DHCP ; then
+# if [ ! -x /sbin/dhcpcd ] && [ -x /sbin/udhcpc ] ; then
+# PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null`
+# if [ -n "$PID" ] ; then
+# ifconfig $DEVICE 0.0.0.0
+# fi
+# fi
+# fi
-'suspend'|'resume')
;;
*)
@@ -1,124 +0,0 @@
--- pcmcia-cs/etc/config.orig 2004-07-16 18:38:25.000000000 +0200
+++ pcmcia-cs/etc/config 2005-10-03 13:02:49.000000000 +0200
@@ -1151,10 +1151,6 @@
#
# Wireless network adapters
#
-card "Intersil PRISM2 11 Mbps Wireless Adapter"
- manfid 0x0156, 0x0002
- bind "orinoco_cs"
-
card "350 Series Wireless LAN Adapter"
manfid 0x015f, 0x000a
bind "airo_cs"
@@ -1180,25 +1176,11 @@
manfid 0x015f, 0x0007
bind "airo_cs"
-card "Airvast WN-100"
- #version "WLAN", "PRISM PCMCIA CARD"
- manfid 0x50c2, 0x7300
- bind "orinoco_cs"
-
-card "AirWay 802.11 Adapter (PCMCIA)"
- #version "AirWay", "802.11 Adapter (PCMCIA)"
- manfid 0x0261, 0x0002
- bind "orinoco_cs"
-
card "ARtem Onair Version 1.0"
#version "ARtem", "Onair", "Version 1.0"
manfid 0x0268, 0x0001
bind "orinoco_cs"
-card "ASUS SpaceLink WL-100"
- manfid 0x02aa, 0x0002
- bind "orinoco_cs"
-
card "AT&T WaveLAN Adapter"
version "AT&T", "WaveLAN/PCMCIA"
bind "wavelan_cs"
@@ -1215,18 +1197,6 @@
version "Cabletron", "RoamAbout 802.11 DS"
bind "orinoco_cs"
-card "Compaq WL100 11 Mbps Wireless Adapter"
- manfid 0x0138, 0x0002
- bind "orinoco_cs"
-
-card "Compaq HNW-100 11 Mbps Wireless Adapter"
- manfid 0x028a, 0x0002
- bind "orinoco_cs"
-
-card "Conceptronic CON11Cpro"
- manfid 0xc250, 0x0002
- bind "orinoco_cs"
-
card "Corega PCC-11"
version "corega K.K.", "Wireless LAN PCC-11"
bind "orinoco_cs"
@@ -1247,10 +1217,6 @@
version "D", "Link DRC-650 11Mbps WLAN Card"
bind "orinoco_cs"
-card "D-Link DCF660"
- manfid 0xd601, 0x0005
- bind "orinoco_cs"
-
card "ELSA AirLancer MC-11"
version "ELSA", "AirLancer MC-11"
bind "orinoco_cs"
@@ -1275,14 +1241,6 @@
version "Instant Wireless ", " Network PC CARD", "Version 01.02"
bind "orinoco_cs"
-card "Linksys WPC11 11Mbps 802.11b WLAN Card"
- manfid 0x0274, 0x1613
- bind "orinoco_cs"
-
-card "Linksys WCF12 Wireless CompactFlash Card"
- manfid 0x028a, 0x0673
- bind "orinoco_cs"
-
card "Lucent Technologies WaveLAN/IEEE Adapter"
version "Lucent Technologies", "WaveLAN/IEEE"
bind "orinoco_cs"
@@ -1343,27 +1301,10 @@
manfid 0x01a6, 0x0000
bind "ray_cs"
-card "Safeway 802.11b Wireless Adapter"
- manfid 0xd601, 0x0002
- bind "orinoco_cs"
-
card "SAMSUNG 11Mbps WLAN Card"
version "SAMSUNG", "11Mbps WLAN Card"
bind "orinoco_cs"
-card "Sandisk Connect SDWCFB-000"
- manfid 0xd601, 0x0005
- bind "orinoco_cs"
-
-card "Sohoware NCP110"
- manfid 0x000b,0x7300
- bind "orinoco_cs"
-
-card "SpeedStream SS1021 Wireless Adapter"
- #version "Siemens", "SpeedStream Wireless PCMCIA"
- manfid 0x02ac, 0x0002
- bind "orinoco_cs"
-
card "Xircom CreditCard Netwave"
version "Xircom", "CreditCard Netwave"
bind "netwave_cs"
@@ -1372,11 +1313,6 @@
manfid 0x0105, 0x0007
bind "airo_cs"
-card "ZCOMAX AirRunner/XI-300"
- #version "ZCOMAX", "AirRunner/XI-300"
- manfid 0xd601, 0x0002
- bind "orinoco_cs"
-
#
# Modems and other serial devices
#
-11
View File
@@ -1,11 +0,0 @@
--- pcmcia-cs-3.2.8/etc/rc.pcmcia.orig 2005-04-22 23:14:56.308784152 +0100
+++ pcmcia-cs-3.2.8/etc/rc.pcmcia 2005-04-22 23:15:34.637957232 +0100
@@ -140,7 +140,7 @@
echo -n "Shutting down PCMCIA services: "
if [ -s /var/run/cardmgr.pid ] ; then
PID=`cat /var/run/cardmgr.pid`
- kill $PID
+ kill -9 $PID
# Give cardmgr a few seconds to handle the signal
for N in 1 2 3 4 5 1 2 3 4 5 1 2 3 4 5 ; do
kill -0 $PID 2>/dev/null || break
@@ -1,30 +0,0 @@
--- pcmcia-cs-3.2.8/etc/rc.pcmcia~pcic-extra
+++ pcmcia-cs-3.2.8/etc/rc.pcmcia
@@ -104,11 +104,17 @@ for x in "1" ; do
(/sbin/modprobe yenta_socket >/dev/null 2>&1 &&
echo "using yenta_socket instead of $PCIC") ||
/sbin/modprobe $PCIC $PCIC_OPTS || break
- /sbin/modprobe ds || break
+ /sbin/modprobe $DS || break
+ if [ "x$PCIC_EXTRA" != "x" ]; then
+ /sbin/modprobe $PCIC_EXTRA
+ fi
elif [ -d $PC ] ; then
/sbin/insmod $PC/pcmcia_core.o $CORE_OPTS
/sbin/insmod $PC/$PCIC.o $PCIC_OPTS
/sbin/insmod $PC/ds.o
+ if [ "x$PCIC_EXTRA" != "x" ]; then
+ /sbin/insmod $PC/$PCIC_EXTRA
+ fi
else
echo "module directory $PC not found."
break
@@ -154,7 +160,7 @@ for x in "1" ; do
;;
status)
- pid=`/sbin/pidof cardmgr`
+ pid=`/bin/pidof cardmgr`
if [ "$pid" != "" ] ; then
echo "cardmgr (pid $pid) is running..."
EXITCODE=0
@@ -1,23 +0,0 @@
--- pcmcia-cs/etc/config 2005-02-06 17:02:39.714620456 +1300
+++ pcmcia-cs/etc/config 2005-02-06 17:05:06.123362944 +1300
@@ -131,6 +131,9 @@
device "ohci1394_cb"
class "ieee1394" module "cb_enabler", "ohci1394_cb"
+device "hc_sl811_cs"
+ class "usb" module "usbcore", "hc_sl811", "hc_sl811_cs"
+
# dummy drivers
device "dummy_cs" module "dummy_cs"
@@ -2169,6 +2172,10 @@
manfid 0x0137, 0x0003
bind "parport_cs"
+card "RATOC USB HOST CF+ Card"
+ manfid 0xc015, 0x0001
+ bind "hc_sl811_cs"
+
card "TELES S0/PC ISDN"
version "TELES", "S0/PC"
bind "teles_cs"
-28
View File
@@ -1,28 +0,0 @@
# ATA/IDE drive adapter configuration
#
# The address format is "scheme,socket,serial_no[,part]".
#
# For multi-partition devices, first return list of partitions in
# $PARTS. Then, we'll get called for each partition.
#
case "$ADDRESS" in
*,1,*,*)
# Socket 1 is the internal HD; don't do anything clever as it's /
;;
*,*,*,1)
#INFO="Sample IDE setup"
DO_FSTAB="n";
#DO_FSCK="y" ;
DO_MOUNT="y"
#FSTYPE="msdos"
#FSTYPE="auto"
#OPTS=""
#MOUNTPT="/mnt/ide"
;;
*,*,*)
PARTS="1"
# Card eject policy options
NO_CHECK=n
NO_FUSER=y
;;
esac
-47
View File
@@ -1,47 +0,0 @@
# Wireless LAN adapter configuration
#
# Theory of operation :
#
# The script attempts to match a block of settings to the specific wireless
# card inserted, the *first* block matching the card is used.
# The address format is "scheme,socket,instance,hwaddr", with * as a wildcard.
# 'scheme' is the pcmcia scheme (set via 'cardctl scheme XXX').
# 'hwaddr' is the unique MAC address identifier of the wireless card.
# The MAC address is usually printed on the card, or can be found via ifconfig.
# Some examples here use only half of the MAC address with a wildcard to
# match a whole family of cards...
#
# All the Wireless specific configuration is done through the Wireless
# Extensions, so we will just call 'iwconfig' with the right parameters
# defined below.
# Of course, you need to have iwconfig installled on your system.
# To download iwconfig, or for more info on Wireless Extensions :
# http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
#
# Note : you don't need to fill all parameters, leave them blank, in most
# cases the driver will initialise itself with sane defaults values or
# automatically figure out the value... And no drivers do support all
# possible settings...
#
# If you make any mistakes, you'll get a cryptic message in the system
# log. You'll need to figure out on your own which parameter was wrong:
# cardmgr[310]: executing: './network start wvlan0'
# cardmgr[310]: + SIOCSIWMODE: Invalid argument
# I've tried to give more troubleshooting help at :
# http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html#debug
# In case of doubts, just check "/etc/pcmcia/wireless" for the gory details...
#
# Note also that this script will work only with the original Pcmcia scripts,
# and not with the default Red Hat scripts. Send a bug report to Red Hat ;-)
#
# Finally, send comments and flames to me, Jean Tourrilhes <jt@hpl.hp.com>
#
case "$ADDRESS" in
*,*,*,*)
INFO="Default Config"
ESSID=any
MODE=Managed
RATE=auto
;;
esac
-105
View File
@@ -1,105 +0,0 @@
DESCRIPTION = "Utilities and system configuration files for the Linux PCMCIA card services"
SECTION = "base"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "virtual/kernel"
RDEPENDS = "hostap-conf orinoco-conf"
PR = "r28"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
file://busybox.patch;patch=1 \
file://network.patch;patch=1 \
file://pcic-extra.patch;patch=1 \
file://automount.patch;patch=1 \
file://ratoc-cfu1u.patch;patch=1 \
file://no-hostap-cards.patch;patch=1 \
file://gcc4_fixes.patch;patch=1 \
file://pcmcia \
file://ide.opts \
file://wireless.opts \
file://network.conf \
file://wnv.conf"
SRC_URI_append_spitz = " file://nocleanup.patch;patch=1"
SRC_URI_append_sh3 = " file://superh-noO3.patch;patch=1"
S = "${WORKDIR}/pcmcia-cs-${PV}"
INITSCRIPT_NAME = "pcmcia"
INITSCRIPT_PARAMS = "defaults"
inherit update-rc.d module-base
export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"
sbindir = "/sbin"
do_configure() {
touch .prereq.ok
touch config.out
cat >config.mk <<EOF
UCC=${CC}
UFLAGS=${CFLAGS} -I${S}/include
HAS_WORDEXP=y
SYSV_INIT=y
RC_DIR=/etc
CONFIG_PNP_BIOS=n
ARCH=${ARCH}
CONFIG_CARDBUS=n
CONFIG_PCMCIA=y
CONFIG_INET=y
CONFIG_SCSI=y
DO_IDE=y
EOF
cat >include/pcmcia/autoconf.h <<EOF
#define HAS_WORDEXP 1
EOF
}
do_compile() {
oe_runmake all HAS_XPM= FLIBS="" XMANDIR=""
}
INSTALL_ETC = "ftl ide ieee1394 memory network parport scsi serial wireless"
INSTALL_ETC_DATA = "config config.opts ftl.opts ieee1394.opts memory.opts network.opts parport.opts scsi.opts serial.opts shared"
INSTALL_ETC_DATA_arm = "config ftl.opts ieee1394.opts memory.opts network.opts parport.opts scsi.opts serial.opts shared"
do_install() {
install -d ${D}${sbindir}
for f in cardmgr/cardctl cardmgr/cardmgr cardmgr/ide_info cardmgr/ifport cardmgr/ifuser cardmgr/pcinitrd flash/ftl_check flash/ftl_format
do
install -m 0755 $f ${D}${sbindir}/
done
install -d ${D}${sysconfdir}/init.d \
${D}${sysconfdir}/pcmcia \
${D}${sysconfdir}/pcmcia/cis
install -m 0644 ${WORKDIR}/network.conf ${D}${sysconfdir}/pcmcia/
install -m 0644 ${WORKDIR}/wnv.conf ${D}${sysconfdir}/pcmcia/
for i in ${INSTALL_ETC}; do
install -m 0755 etc/${i} ${D}${sysconfdir}/pcmcia/
done
for i in ${INSTALL_ETC_DATA}; do
install -m 0644 etc/${i} ${D}${sysconfdir}/pcmcia/
done
# ensure that config.opts always exists, albeit empty
echo >> ${D}${sysconfdir}/pcmcia/config.opts
install -m 0644 ${WORKDIR}/ide.opts ${D}${sysconfdir}/pcmcia/
install -m 0644 ${WORKDIR}/wireless.opts ${D}${sysconfdir}/pcmcia/
for i in etc/cis/*; do
install -m 0644 $i ${D}${sysconfdir}/pcmcia/cis/
done
install -m 0755 etc/rc.pcmcia ${D}${sysconfdir}/init.d/pcmcia
install -d ${D}${sysconfdir}/sysconfig
install -m 0755 ${WORKDIR}/pcmcia ${D}${sysconfdir}/sysconfig/pcmcia
}
PACKAGES =+ "${PN}-ftl ${PN}-pcinitrd"
FILES_${PN} = "${sbindir} ${sysconfdir}"
FILES_${PN}-ftl = "/sbin/ftl_format /sbin/ftl_check /etc/pcmcia/ftl*"
FILES_${PN}-pcinitrd = "/sbin/pcinitrd"