Remove PCMCIA relics

This commit is contained in:
Marcel Holtmann 2006-06-06 00:08:22 +00:00
parent 7e394a314c
commit 53a07765b2
7 changed files with 2 additions and 192 deletions

View File

@ -1,6 +1,6 @@
SUBDIRS = common daemon tools rfcomm hcid sdpd dund pand hidd \
cups fuse alsa test scripts pcmcia extra
cups fuse alsa test scripts extra
MAINTAINERCLEANFILES = Makefile.in \
aclocal.m4 configure config.h.in config.sub config.guess \

View File

@ -104,7 +104,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
alsa_enable=no
test_enable=no
cups_enable=no
pcmcia_enable=no
initscripts_enable=no
bccmd_enable=no
avctrl_enable=no
@ -131,7 +130,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
alsa_enable=${enableval}
test_enable=${enableval}
cups_enable=${enableval}
pcmcia_enable=${enableval}
initscripts_enable=${enableval}
bccmd_enable=${enableval}
avctrl_enable=${enableval}
@ -160,10 +158,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
cups_enable=${enableval}
])
AC_ARG_ENABLE(pcmcia, AC_HELP_STRING([--enable-pcmcia], [install PCMCIA configuration files ]), [
pcmcia_enable=${enableval}
])
AC_ARG_ENABLE(initscripts, AC_HELP_STRING([--enable-initscripts], [install Bluetooth boot scripts]), [
initscripts_enable=${enableval}
])
@ -206,7 +200,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes")
AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")
AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes")
AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
AM_CONDITIONAL(INITSCRIPTS, test "${initscripts_enable}" = "yes")
AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes" && test "${usb_found}" = "yes")
AM_CONDITIONAL(AVCTRL, test "${avctrl_enable}" = "yes" && test "${usb_found}" = "yes")

View File

@ -12,5 +12,4 @@ fi
--sysconfdir=/etc \
--localstatedir=/var \
--enable-all \
--disable-pcmcia \
--disable-initscripts

View File

@ -31,4 +31,4 @@ AC_PATH_USB
AC_ARG_BLUEZ
AC_OUTPUT(Makefile common/Makefile daemon/Makefile tools/Makefile rfcomm/Makefile hcid/Makefile sdpd/Makefile dund/Makefile pand/Makefile hidd/Makefile cups/Makefile fuse/Makefile alsa/Makefile test/Makefile scripts/Makefile pcmcia/Makefile extra/Makefile)
AC_OUTPUT(Makefile common/Makefile daemon/Makefile tools/Makefile rfcomm/Makefile hcid/Makefile sdpd/Makefile dund/Makefile pand/Makefile hidd/Makefile cups/Makefile fuse/Makefile alsa/Makefile test/Makefile scripts/Makefile extra/Makefile)

View File

@ -1,12 +0,0 @@
datafiles = bluetooth bluetooth.conf
if PCMCIA
pcmciadir = $(sysconfdir)/pcmcia
pcmcia_DATA = $(datafiles)
endif
EXTRA_DIST = $(datafiles)
MAINTAINERCLEANFILES = Makefile.in

View File

@ -1,54 +0,0 @@
#!/bin/sh
#
# bluetooth
#
# PCMCIA Bluetooth device initialization
# Written by Maxim Krasnyanskiy <maxk@qualcomm.com>
#
# This script requires new cardmgr and expects following
# environment variables FUNCTION, VENDORID, CARDNAME
#
if [ -r ./shared ]; then . ./shared ; else . /etc/pcmcia/shared ; fi
# Get device attributes
get_info $DEVICE
#
# Serial devices
#
start_serial() {
IRQ=`setserial /dev/$DEVICE | sed -e 's/.*IRQ: //'`
setserial /dev/$DEVICE irq 0 ; setserial /dev/$DEVICE irq $IRQ
/usr/sbin/hciattach $DEVICE $MANFID
}
stop_serial() {
do_fuser -k -HUP /dev/$DEVICE > /dev/null
}
suspend_serial() {
stop_serial
}
resume_serial() {
start_serial
}
start=
stop=
suspend=
resume=
check=
cksum=
case "$FUNCID" in
2) # Serial
start=start_serial
stop=stop_serial
suspend=suspend_serial
resume=resume_serial
;;
esac
eval \$$ACTION
exit 0

View File

@ -1,116 +0,0 @@
device "dtl1_cs"
class "bluetooth" module "dtl1_cs"
device "bt3c_cs"
class "bluetooth" module "bt3c_cs"
device "bluecard_cs"
class "bluetooth" module "bluecard_cs"
device "bt950_cs"
class "bluetooth" module "bt950_cs"
device "btuart_cs"
class "bluetooth" module "btuart_cs"
card "Xircom CreditCard Bluetooth Adapter"
version "Xircom", "*", "CBT"
bind "serial_cs" class "bluetooth"
card "Xircom RealPort2 Bluetooth Adapter"
version "Xircom", "*", "R2BT"
bind "serial_cs" class "bluetooth"
card "Brain Boxes BL-620 Bluetooth Adapter"
version "Brain Boxes", "Bluetooth PC Card"
bind "serial_cs" class "bluetooth"
card "IBM Bluetooth PC Card II"
version "IBM", "Bluetooth PC Card II"
bind "serial_cs" class "bluetooth"
card "TDK Bluetooth PC Card"
version "TDK", "Bluetooth PC Card"
bind "serial_cs" class "bluetooth"
card "TDK Bluetooth PC Card II"
version "TDK", "Bluetooth PC Card II"
bind "serial_cs" class "bluetooth"
card "AmbiCom BT2000C Bluetooth PC/CF Card"
version "AmbiCom BT2000C", "Bluetooth PC/CF Card"
bind "serial_cs" class "bluetooth"
card "COM One Platinium Bluetooth PC Card"
version "COM1 SA", "MC310 CARD"
bind "serial_cs" class "bluetooth"
card "Sphinx PICO Card"
version "SPHINX", "BT-CARD"
bind "serial_cs" class "bluetooth"
card "H-Soft blue+Card"
version "H-Soft", "Blue+CARD"
bind "serial_cs" class "bluetooth"
card "Compaq iPAQ Bluetooth Sleeve"
version "CF CARD", "GENERIC"
bind "serial_cs" class "bluetooth"
card "Zoom Bluetooth Card"
version "PCMCIA", "Bluetooth Card"
bind "serial_cs" class "bluetooth"
card "Sitecom CN-504 Card"
version "PCMCIA", "Bluetooth Card"
bind "serial_cs" class "bluetooth"
card "Nokia Bluetooth Card"
version "Nokia Mobile Phones", "DTL-1"
bind "dtl1_cs"
card "Nokia Bluetooth Card"
version "Nokia Mobile Phones", "DTL-4"
bind "dtl1_cs"
card "Socket Bluetooth Card"
version "Socket", "CF+ Personal Network Card"
bind "dtl1_cs"
card "3Com Bluetooth PC Card"
version "3COM", "*", "Bluetooth PC Card"
bind "bt3c_cs"
card "LSE041 Bluetooth PC Card"
version "BlueCard", "LSE041"
bind "bluecard_cs"
card "LSE039 Bluetooth Compact Flash Card"
version "WSS", "LSE039"
bind "bluecard_cs"
card "LSE139 Bluetooth Compact Flash Card"
version "BTCFCARD", "LSE139"
bind "bluecard_cs"
card "AmbiCom BT2000E Bluetooth Card"
version "AmbiCom,Inc", "BT2000E"
bind "bt950_cs"
card "Pretec BT2000E Bluetooth Card"
version "Pretec", "BT2000E"
bind "bt950_cs"
card "Billionton Bluetooth Card"
version "Compact Flash", "Bluetooth Card"
bind "bt950_cs"
card "Cyber-blue Compact Flash Card"
version "BT", "", "", ""
bind "btuart_cs"