Latest fixes for Mac OS 12,1 bluetooth patch

master
gdm85 8 years ago
parent 6cbfaa595c
commit 49d951e855

1
.gitignore vendored

@ -2,4 +2,3 @@ rkt/nginx/nginx.aci
lxd/busybox-nonroot/busybox-nonroot.tar.xz
docker/ubuntu-kernelbuilder/packages
docker/ubuntu-kernelbuilder/patches

@ -4,6 +4,7 @@
## @author gdm85
##
## Build a kernel with fixed bluetooth support for Mac OS 12,1 and Ubuntu Wily
## Based on instructions read from http://www.spinics.net/lists/linux-bluetooth/msg64123.html
##
#
@ -13,7 +14,9 @@ set -e
cd "$SCRIPTS"
#./build-ubuntu-image.sh wily
if ! docker inspect gdm85/wily >/dev/null 2>/dev/null; then
./build-ubuntu-image.sh wily
fi
cd ../ubuntu-pkgbuilder
@ -25,23 +28,24 @@ cat<<EOF > patches/macos-121-btusb-fix.patch
--- a/drivers/bluetooth/btusb.c 2015-10-28 14:52:20.466644715 +0000
+++ b/drivers/bluetooth/btusb.c 2015-10-28 14:52:34.715107143 +0000
@@ -2657,7 +2657,7 @@
BT_DBG("intf %p id %p", intf, id);
BT_DBG("intf %p id %p", intf, id);
/* interface numbers are hardcoded in the spec */
- if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
+ if (intf->cur_altsetting->desc.bInterfaceNumber != 1)
return -ENODEV;
/* interface numbers are hardcoded in the spec */
- if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
+ if (intf->cur_altsetting->desc.bInterfaceNumber != 2)
return -ENODEV;
if (!id->driver_info) {
if (!id->driver_info) {
@@ -2827,7 +2827,7 @@
data->isoc = NULL;
} else {
/* Interface numbers are hardcoded in the specification */
- data->isoc = usb_ifnum_to_if(data->udev, 1);
+ data->isoc = usb_ifnum_to_if(data->udev, 3);
}
data->isoc = NULL;
} else {
/* Interface numbers are hardcoded in the specification */
- data->isoc = usb_ifnum_to_if(data->udev, 1);
+ data->isoc = usb_ifnum_to_if(data->udev, 3);
}
if (!reset)
if (!reset)
EOF
make wily linux-image-wily

@ -12,3 +12,5 @@ RUN mkdir build && cd build && apt-get source linux-image-$KERNEL_VERSION
## add build script
COPY build-kernel.sh /home/rdeckard/
RUN chown rdeckard.rdeckard /home/rdeckard/build-kernel.sh

@ -0,0 +1,21 @@
--- a/drivers/bluetooth/btusb.c 2015-10-28 14:52:20.466644715 +0000
+++ b/drivers/bluetooth/btusb.c 2015-10-28 14:52:34.715107143 +0000
@@ -2657,7 +2657,7 @@
BT_DBG("intf %p id %p", intf, id);
/* interface numbers are hardcoded in the spec */
- if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
+ if (intf->cur_altsetting->desc.bInterfaceNumber != 2)
return -ENODEV;
if (!id->driver_info) {
@@ -2827,7 +2827,7 @@
data->isoc = NULL;
} else {
/* Interface numbers are hardcoded in the specification */
- data->isoc = usb_ifnum_to_if(data->udev, 1);
+ data->isoc = usb_ifnum_to_if(data->udev, 3);
}
if (!reset)
Loading…
Cancel
Save