> Thanks Walter, I welcome these changes but I got them in
> quoted-printable format, and was unable to save them. Can
> you please
> resend as plain ascii text and also include linux-bluetooth
> as these
> are related to that subsystem and those guys would likely
> want to
> review these patches as well.
>
> Luis
Luis, I did send them as plain text, I don't know why this happened. I didn't send these patches any differently from the previous ones. Anyway, I'm attaching them to this email with their respective number. Let me know if this works.
Walter
update bluetooth in Makefile
Signed-off-by: Walter Goldens <goldenstranger@xxxxxxxxx>
---
--- a/Makefile
+++ b/Makefile
@@ -93,19 +93,32 @@ bt-install-modules: bt
@echo
@echo "Currently detected bluetooth subsystem modules:"
@echo
- @$(MODPROBE) -l sco
- @$(MODPROBE) -l l2cap
- @$(MODPROBE) -l hidp
- @$(MODPROBE) -l rfcomm
+ @$(MODPROBE) -l ath3k
+ @$(MODPROBE) -l bcm203x
+ @$(MODPROBE) -l bluecard_cs
+ @$(MODPROBE) -l bluetooth
@$(MODPROBE) -l bnep
+ @$(MODPROBE) -l bpa10x
+ @$(MODPROBE) -l bt3c_cs
+ @$(MODPROBE) -l btmrvl
+ @$(MODPROBE) -l btmrvl_sdio
+ @$(MODPROBE) -l btsdio
@$(MODPROBE) -l btusb
- @$(MODPROBE) -l bluetooth
+ @$(MODPROBE) -l btuart_cs
+ @$(MODPROBE) -l cmtp
+ @$(MODPROBE) -l dtl1_cs
+ @$(MODPROBE) -l hidp
+ @$(MODPROBE) -l hci_vhci
+ @$(MODPROBE) -l hci_uart
+ @$(MODPROBE) -l l2cap
+ @$(MODPROBE) -l rfcomm
+ @$(MODPROBE) -l sco
@echo
@echo Now run:
@echo
@echo sudo make btunload:
@echo
- @echo And the load the needed bluetooth modules. If unsure reboot.
+ @echo And then load the needed bluetooth modules. If unsure reboot.
@echo
btuninstall:
@@ -118,14 +131,26 @@ btuninstall:
@echo
@echo "Your old bluetooth subsystem modules were left intact:"
@echo
- @$(MODPROBE) -l sco
- @$(MODPROBE) -l l2cap
- @$(MODPROBE) -l hidp
- @$(MODPROBE) -l rfcomm
+ @$(MODPROBE) -l ath3k
+ @$(MODPROBE) -l bcm203x
+ @$(MODPROBE) -l bluecard_cs
+ @$(MODPROBE) -l bluetooth
@$(MODPROBE) -l bnep
+ @$(MODPROBE) -l bpa10x
+ @$(MODPROBE) -l bt3c_cs
+ @$(MODPROBE) -l btmrvl
+ @$(MODPROBE) -l btmrvl_sdio
+ @$(MODPROBE) -l btsdio
@$(MODPROBE) -l btusb
- @$(MODPROBE) -l bluetooth
- @
+ @$(MODPROBE) -l btuart_cs
+ @$(MODPROBE) -l cmtp
+ @$(MODPROBE) -l dtl1_cs
+ @$(MODPROBE) -l hidp
+ @$(MODPROBE) -l hci_vhci
+ @$(MODPROBE) -l hci_uart
+ @$(MODPROBE) -l l2cap
+ @$(MODPROBE) -l rfcomm
+ @$(MODPROBE) -l sco
@echo
btclean:
@@ -263,22 +288,35 @@ install-scripts:
@echo
@echo "Currently detected bluetooth subsystem modules:"
@echo
- @$(MODPROBE) -l sco
- @$(MODPROBE) -l l2cap
- @$(MODPROBE) -l hidp
- @$(MODPROBE) -l rfcomm
+ @$(MODPROBE) -l ath3k
+ @$(MODPROBE) -l bcm203x
+ @$(MODPROBE) -l bluecard_cs
+ @$(MODPROBE) -l bluetooth
@$(MODPROBE) -l bnep
+ @$(MODPROBE) -l bpa10x
+ @$(MODPROBE) -l bt3c_cs
+ @$(MODPROBE) -l btmrvl
+ @$(MODPROBE) -l btmrvl_sdio
+ @$(MODPROBE) -l btsdio
@$(MODPROBE) -l btusb
- @$(MODPROBE) -l bluetooth
+ @$(MODPROBE) -l btuart_cs
+ @$(MODPROBE) -l cmtp
+ @$(MODPROBE) -l dtl1_cs
+ @$(MODPROBE) -l hidp
+ @$(MODPROBE) -l hci_vhci
+ @$(MODPROBE) -l hci_uart
+ @$(MODPROBE) -l l2cap
+ @$(MODPROBE) -l rfcomm
+ @$(MODPROBE) -l sco
@echo
@echo Now run:
@echo
- @echo sudo make unload to unload both wireless and bluetooth modules
+ @echo sudo make unload to unload all: wireless, bluetooth and ethernet modules
@echo sudo make wlunload to unload wireless modules
@echo sudo make btunload to unload bluetooth modules
@echo
- @echo And then load the wireless or bluetooth module you need. If unsure reboot.
- @echo Alternatively use "sudo make load/wlload/btload" to load modules
+ @echo Run sudo modprobe 'driver-name' to load your desired driver.
+ @echo If unsure reboot.
@echo
uninstall:
@@ -379,13 +417,26 @@ uninstall:
@echo
@echo "Your old bluetooth subsystem modules were left intact:"
@echo
- @$(MODPROBE) -l sco
- @$(MODPROBE) -l l2cap
- @$(MODPROBE) -l hidp
- @$(MODPROBE) -l rfcomm
+ @$(MODPROBE) -l ath3k
+ @$(MODPROBE) -l bcm203x
+ @$(MODPROBE) -l bluecard_cs
+ @$(MODPROBE) -l bluetooth
@$(MODPROBE) -l bnep
+ @$(MODPROBE) -l bpa10x
+ @$(MODPROBE) -l bt3c_cs
+ @$(MODPROBE) -l btmrvl
+ @$(MODPROBE) -l btmrvl_sdio
+ @$(MODPROBE) -l btsdio
@$(MODPROBE) -l btusb
- @$(MODPROBE) -l bluetooth
+ @$(MODPROBE) -l btuart_cs
+ @$(MODPROBE) -l cmtp
+ @$(MODPROBE) -l dtl1_cs
+ @$(MODPROBE) -l hidp
+ @$(MODPROBE) -l hci_vhci
+ @$(MODPROBE) -l hci_uart
+ @$(MODPROBE) -l l2cap
+ @$(MODPROBE) -l rfcomm
+ @$(MODPROBE) -l sco
@
@echo
@@ -397,22 +448,14 @@ clean:
unload:
@./scripts/unload.sh
-load: unload
- @./scripts/load.sh
-
btunload:
@./scripts/btunload.sh
-btload: btunload
- @./scripts/btload.sh
-
wlunload:
@./scripts/wlunload.sh
-wlload: wlunload
- @./scripts/wlload.sh
-.PHONY: all clean install uninstall unload load btunload btload wlunload wlload modules bt
+.PHONY: all clean install uninstall unload btunload wlunload modules bt
endif
reshuffle driver-select, enable "bt" group for all bluetooth modules with driver-select
Signed-off-by: Walter Goldens <goldenstranger@xxxxxxxxx>
---
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -53,11 +53,6 @@ function usage {
echo -e "\t${PURPLE}${i}${NORMAL}"
done
- echo -e "\nSupported Ethernet drivers: < ${PURPLE}atl1 atl2 atl1e atl1c${NORMAL} >"
- for i in $SUPPORTED_ETH_DRIVERS; do
- echo -e "\t${PURPLE}${i}${NORMAL}"
- done
-
# These should match the switch below.
echo -e "\nSupported group drivers:"
echo -e "\t${CYAN}atheros${NORMAL} < ${PURPLE} ath5k ath9k carl9170 zd1211rw ${NORMAL}>"
@@ -67,7 +62,9 @@ function usage {
echo -e "\t${CYAN}rtl818x${NORMAL} < ${PURPLE} rtl8180 rtl8187 ${NORMAL}>"
echo -e "\t${CYAN}wl12xx${NORMAL} < ${PURPLE} wl1251 wl1271 (SPI and SDIO)${NORMAL}>"
+ echo -e "\nSupported group drivers: Bluetooth & Ethernet:"
echo -e "\t${BLUE}atlxx${NORMAL} < ${PURPLE} atl1 atl2 atl1e atl1c ${NORMAL}>"
+ echo -e "\t${BLUE}bt${NORMAL} < ${PURPLE} Linux bluetooth drivers ${NORMAL}>"
echo -e "Restoring compat-wireless:"
echo -e "\t${GREEN}restore${NORMAL}: you can use this option to restore compat-wireless to the original state"
@@ -390,7 +387,7 @@ case $1 in
disable_staging
disable_var_01
;;
-# Ethernet drivers
+# Ethernet and Bluetooth drivers
atl1)
enable_only_ethernet
echo -e "obj-\$(CONFIG_ATL1) += atlx/" > $DRIVERS_NET
@@ -412,6 +409,13 @@ case $1 in
enable_only_ethernet
disable_b44
;;
+ bt)
+ select_driver CONFIG_BT
+ disable_var
+ disable_ethernet
+ disable_staging
+ disable_80211
+ ;;
*)
echo "Unsupported driver"
exit
update unloading scripts for bt
Signed-off-by: Walter Goldens <goldenstranger@xxxxxxxxx>
---
--- a/scripts/unload.sh
+++ b/scripts/unload.sh
@@ -27,14 +27,16 @@ MODULES="$MODULES rtl8180 rtl8187"
MODULES="$MODULES mwl8k mac80211_hwsim"
MODULES="$MODULES at76c50x_usb at76_usb"
MODULES="$MODULES rndis_wlan rndis_host cdc_ether usbnet"
-MODULES="$MODULES atl1 atl2 atl1e atl1c"
# eeprom_93cx6 is used by rt2x00 (rt61pci, rt2500pci, rt2400pci)
# and Realtek drivers ( rtl8187, rtl8180)
MODULES="$MODULES eeprom_93cx6"
MODULES="$MODULES lib80211_crypt_ccmp lib80211_crypt_tkip lib80211_crypt_wep"
MODULES="$MODULES mac80211 cfg80211 lib80211"
-MODULES="$MODULES hidp rfcomm bnep l2cap sco btusb bluetooth"
MODULES="$MODULES compat"
+# Bluetooth modules
+MODULES="$MODULES ath3k bcm203x bluecard_cs bnep bpa10x bt3c_cs btmrvl btmrvl_sdio btsdio"
+MODULES="$MODULES btusb btuart_cs cmtp dtl1_cs hidp hci_vhci hci_uart rfcomm sco bluetooth l2cap"
+MODULES="$MODULES atl1 atl2 atl1e atl1c"
echo Stoping bluetooth service..
/etc/init.d/bluetooth stop
/etc/init.d/bluetooth status
--- a/scripts/btunload.sh
+++ b/scripts/btunload.sh
@@ -1,5 +1,6 @@
#!/bin/bash
-MODULES="hidp rfcomm bnep l2cap sco btusb bluetooth"
+MODULES="$MODULES ath3k bcm203x bluecard_cs bnep bpa10x bt3c_cs btmrvl btmrvl_sdio btsdio"
+MODULES="$MODULES btusb btuart_cs cmtp dtl1_cs hidp hci_vhci hci_uart rfcomm sco bluetooth l2cap"
echo Stoping bluetooth service..
/etc/init.d/bluetooth stop
/etc/init.d/bluetooth status
delete obsolete load scripts
Signed-off-by: Walter Goldens <goldenstranger@xxxxxxxxx>
---
--- a/scripts/load.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-MODULES="ipw2100 ipw2200 libertas_cs usb8xxx"
-MODULES="$MODULES p54pci p54usb"
-MODULES="$MODULES adm8211 zd1211rw"
-MODULES="$MODULES rtl8180 rtl8187"
-MODULES="$MODULES p54pci p54usb"
-MODULES="$MODULES iwl3945 iwlagn"
-MODULES="$MODULES ath ar9170usb"
-MODULES="$MODULES rtl8180 rtl8187"
-MODULES="$MODULES rt2400pci rt2500pci rt61pci"
-MODULES="$MODULES rt2500usb rt73usb"
-MODULES="$MODULES rndis_wlan at76_usb"
-MODULES="$MODULES mwl8k mac80211_hwsim"
-MODULES="$MODULES at76c50x_usb"
-MODULES="$MODULES bluetooth btusb l2cap sco hidp rfcomm bnep"
-for i in $MODULES; do
- echo Loading $i...
- modprobe $i
-done
-# For ath5k we must be sure to unload MadWifi first
-athload ath5k
-# For b43 we must make sure to unload bcm43xx first
-b43load b43
-echo Starting bluetooth service..
-/etc/init.d/bluetooth start
-/etc/init.d/bluetooth status
--- a/scripts/wlload.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-MODULES="ipw2100 ipw2200 libertas_cs usb8xxx"
-MODULES="$MODULES p54pci p54usb"
-MODULES="$MODULES adm8211 zd1211rw"
-MODULES="$MODULES rtl8180 rtl8187"
-MODULES="$MODULES p54pci p54usb"
-MODULES="$MODULES iwl3945 iwlagn"
-MODULES="$MODULES ath ar9170usb"
-MODULES="$MODULES rtl8180 rtl8187"
-MODULES="$MODULES rt2400pci rt2500pci rt61pci"
-MODULES="$MODULES rt2500usb rt73usb"
-MODULES="$MODULES rndis_wlan at76_usb"
-MODULES="$MODULES mwl8k mac80211_hwsim"
-MODULES="$MODULES at76c50x_usb"
-for i in $MODULES; do
- echo Loading $i...
- modprobe $i
-done
-# For ath5k we must be sure to unload MadWifi first
-athload ath5k
-# For b43 we must make sure to unload bcm43xx first
-b43load b43
--- a/scripts/btload.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-MODULES="bluetooth btusb l2cap sco hidp rfcomm bnep"
-for i in $MODULES; do
- echo Loading $i...
- modprobe $i
-done
-echo Starting bluetooth service..
-/etc/init.d/bluetooth start
-/etc/init.d/bluetooth status
-
