diff --git a/Makefile.am b/Makefile.am
index d258f86..4a733ec 100644
--- a/Makefile.am
+++ b/Makefile.am
udev_files += scripts/bluetooth-hid2hci.rules
endif
-if PCMCIA
-udevdir = @UDEV_DIR@
-
-udev_files += scripts/bluetooth-serial.rules
-
-dist_udev_SCRIPTS = scripts/bluetooth_serial
-endif
-
rules_DATA = $(foreach file,$(udev_files), scripts/97-$(notdir $(file)))
endif
CLEANFILES += $(rules_DATA)
-EXTRA_DIST += scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules
+EXTRA_DIST += scripts/bluetooth-hid2hci.rules
EXTRA_DIST += doc/adapter-api.txt doc/device-api.txt doc/profile-api.txt \
doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \
diff --git a/acinclude.m4 b/acinclude.m4
index 75d68ab..4893e59 100644
--- a/acinclude.m4
+++ b/acinclude.m4
cups_enable=no
test_enable=no
bccmd_enable=no
- pcmcia_enable=no
hid2hci_enable=no
datafiles_enable=yes
telephony_driver=dummy
bccmd_enable=${enableval}
])
- AC_ARG_ENABLE(pcmcia, AC_HELP_STRING([--enable-pcmcia], [install PCMCIA serial script]), [
- pcmcia_enable=${enableval}
- ])
-
AC_ARG_ENABLE(hid2hci, AC_HELP_STRING([--enable-hid2hci], [install HID mode switching utility]), [
hid2hci_enable=${enableval}
])
AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes")
AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes")
AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes")
- AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
AM_CONDITIONAL(HID2HCI, test "${hid2hci_enable}" = "yes" && test "${usb_found}" = "yes" && test "${udev_found}" = "yes")
AM_CONDITIONAL(DATAFILES, test "${datafiles_enable}" = "yes")
AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes")
diff --git a/bootstrap-configure b/bootstrap-configure
index 0db44f9..c8b49ad 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
--enable-neard \
--enable-sap \
--enable-wiimote \
- --disable-pcmcia \
--disable-datafiles $*
diff --git a/scripts/bluetooth-serial.rules b/scripts/bluetooth-serial.rules
deleted file mode 100644
index 072335f..0000000
--- a/scripts/bluetooth-serial.rules
+++ /dev/null
-# Brain Boxes BL-620 Bluetooth Adapter
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Brain Boxes", ATTRS{prod_id2}=="Bluetooth PC Card", ENV{HCIOPTS}="bboxes", RUN+="bluetooth_serial"
-
-# Xircom CreditCard Bluetooth Adapter
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Xircom", ATTRS{prod_id3}=="CBT", ENV{HCIOPTS}="xircom", RUN+="bluetooth_serial"
-
-# Xircom RealPort2 Bluetooth Adapter
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Xircom", ATTRS{prod_id3}=="CBT", ENV{HCIOPTS}="xircom", RUN+="bluetooth_serial"
-
-# IBM Bluetooth PC Card II
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="IBM", ATTRS{prod_id2}=="Bluetooth PC Card II", ENV{HCIOPTS}="tdk", RUN+="bluetooth_serial"
-
-# TDK Bluetooth PC Card
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="TDK", ATTRS{prod_id2}=="Bluetooth PC Card II", ENV{HCIOPTS}="tdk", RUN+="bluetooth_serial"
-
-# AmbiCom BT2000C Bluetooth PC/CF Card
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="AmbiCom BT2000C", ATTRS{prod_id2}=="Bluetooth PC/CF Card", ENV{HCIOPTS}="bt2000c", RUN+="bluetooth_serial"
-
-# COM One Platinium Bluetooth PC Card
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="COM1 SA", ATTRS{prod_id2}=="MC310 CARD", ENV{HCIOPTS}="comone", RUN+="bluetooth_serial"
-
-# Sphinx PICO Card
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="SPHINX", ATTRS{prod_id2}=="BT-CARD", ENV{HCIOPTS}="picocard", RUN+="bluetooth_serial"
-
-# H-Soft blue+Card
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="H-Soft", ATTRS{prod_id2}=="Blue+CARD", ENV{HCIOPTS}="$sysfs{manf_id},$sysfs{card_id}", RUN+="bluetooth_serial"
-
-# Compaq iPAQ Bluetooth Sleeve, Belkin F8T020, any other muppet who used an OXCF950 and didn't bother to program it appropriately.
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="CF CARD", ATTRS{prod_id2}=="GENERIC", ENV{HCIOPTS}="$sysfs{manf_id},$sysfs{card_id}", RUN+="bluetooth_serial"
-
-# Zoom Bluetooth Card and Sitecom CN-504 Card
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="PCMCIA", ATTRS{prod_id2}=="Bluetooth Card", ENV{HCIOPTS}="zoom", RUN+="bluetooth_serial"
-
-# CC&C BT0100M
-SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Bluetooth BT0100M", ENV{HCIOPTS}="bcsp 115200", RUN+="bluetooth_serial"
diff --git a/scripts/bluetooth_serial b/scripts/bluetooth_serial
deleted file mode 100644
index e5be6c2..0000000
--- a/scripts/bluetooth_serial
+++ /dev/null
-#!/bin/sh
-#
-# bluetooth_serial
-#
-# Bluetooth serial PCMCIA card initialization
-#
-
-start_serial()
-{
- if [ ! -x /bin/setserial -o ! -x /usr/sbin/hciattach ]; then
- logger "$0: setserial or hciattach not executable, cannot start $DEVNAME"
- return 1
- fi
-
- if [ "$BAUDBASE" != "" ]; then
- /bin/setserial $DEVNAME baud_base $BAUDBASE
- fi
-
- /usr/sbin/hciattach $DEVNAME $HCIOPTS 2>&1 | logger -t hciattach
-}
-
-stop_serial()
-{
- [ -x /bin/fuser ] || return 1
-
- /bin/fuser -k -HUP $DEVNAME > /dev/null
-}
-
-case "$ACTION" in
- add)
- start_serial
- ;;
- remove)
- stop_serial
- ;;
- *)
- logger "Unknown action received $0: $ACTION"
- ;;
-esac