diff options
Diffstat (limited to 'patches/collateral-evolutions/network/24-pcmcia')
4 files changed, 34 insertions, 34 deletions
diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch index dcaa69c3..83be629e 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch @@ -49,7 +49,7 @@ if (test_bit(XMIT_SENDING_READY, &(info->tx_state))) bluecard_enable_activity_led(info); -@@ -507,7 +524,11 @@ static irqreturn_t bluecard_interrupt(in +@@ -506,7 +523,11 @@ static irqreturn_t bluecard_interrupt(in if (!test_bit(CARD_READY, &(info->hw_state))) return IRQ_HANDLED; @@ -61,7 +61,7 @@ spin_lock(&(info->lock)); -@@ -629,7 +650,11 @@ static int bluecard_hci_open(struct hci_ +@@ -628,7 +649,11 @@ static int bluecard_hci_open(struct hci_ return 0; if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) { @@ -73,7 +73,7 @@ /* Enable LED */ outb(0x08 | 0x20, iobase + 0x30); -@@ -649,7 +674,11 @@ static int bluecard_hci_close(struct hci +@@ -648,7 +673,11 @@ static int bluecard_hci_close(struct hci bluecard_hci_flush(hdev); if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) { @@ -85,7 +85,7 @@ /* Disable LED */ outb(0x00, iobase + 0x30); -@@ -705,7 +734,11 @@ static int bluecard_hci_ioctl(struct hci +@@ -698,7 +727,11 @@ static int bluecard_hci_send_frame(struc static int bluecard_open(bluecard_info_t *info) { @@ -97,7 +97,7 @@ struct hci_dev *hdev; unsigned char id; -@@ -821,7 +854,11 @@ static int bluecard_open(bluecard_info_t +@@ -813,7 +846,11 @@ static int bluecard_open(bluecard_info_t static int bluecard_close(bluecard_info_t *info) { @@ -109,7 +109,7 @@ struct hci_dev *hdev = info->hdev; if (!hdev) -@@ -856,7 +893,18 @@ static int bluecard_probe(struct pcmcia_ +@@ -848,7 +885,18 @@ static int bluecard_probe(struct pcmcia_ info->p_dev = link; link->priv = info; @@ -128,7 +128,7 @@ return bluecard_config(link); } -@@ -873,15 +921,30 @@ static int bluecard_config(struct pcmcia +@@ -865,15 +913,30 @@ static int bluecard_config(struct pcmcia bluecard_info_t *info = link->priv; int i, n; @@ -159,7 +159,7 @@ if (i == 0) break; } -@@ -889,9 +952,15 @@ static int bluecard_config(struct pcmcia +@@ -881,9 +944,15 @@ static int bluecard_config(struct pcmcia if (i != 0) goto failed; @@ -175,7 +175,7 @@ i = pcmcia_enable_device(link); if (i != 0) -@@ -929,7 +998,13 @@ MODULE_DEVICE_TABLE(pcmcia, bluecard_ids +@@ -921,7 +990,13 @@ MODULE_DEVICE_TABLE(pcmcia, bluecard_ids static struct pcmcia_driver bluecard_driver = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bt3c_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bt3c_cs.patch index 6a8aa8eb..7af65a32 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bt3c_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bt3c_cs.patch @@ -24,7 +24,7 @@ avail = bt3c_read(iobase, 0x7006); //printk("bt3c_cs: receiving %d bytes\n", avail); -@@ -345,7 +353,11 @@ static irqreturn_t bt3c_interrupt(int ir +@@ -344,7 +352,11 @@ static irqreturn_t bt3c_interrupt(int ir /* our irq handler is shared */ return IRQ_NONE; @@ -36,7 +36,7 @@ spin_lock(&(info->lock)); -@@ -473,7 +485,11 @@ static int bt3c_load_firmware(bt3c_info_ +@@ -466,7 +478,11 @@ static int bt3c_load_firmware(bt3c_info_ unsigned int iobase, size, addr, fcs, tmp; int i, err = 0; @@ -48,7 +48,7 @@ /* Reset */ bt3c_io_write(iobase, 0x8040, 0x0404); -@@ -645,8 +661,27 @@ static int bt3c_probe(struct pcmcia_devi +@@ -637,8 +653,27 @@ static int bt3c_probe(struct pcmcia_devi info->p_dev = link; link->priv = info; @@ -76,7 +76,7 @@ return bt3c_config(link); } -@@ -657,6 +692,7 @@ static void bt3c_detach(struct pcmcia_de +@@ -649,6 +684,7 @@ static void bt3c_detach(struct pcmcia_de bt3c_release(link); } @@ -84,7 +84,7 @@ static int bt3c_check_config(struct pcmcia_device *p_dev, void *priv_data) { int *try = priv_data; -@@ -695,6 +731,63 @@ static int bt3c_check_config_notpicky(st +@@ -687,6 +723,63 @@ static int bt3c_check_config_notpicky(st } return -ENODEV; } @@ -148,7 +148,7 @@ static int bt3c_config(struct pcmcia_device *link) { -@@ -718,9 +811,15 @@ static int bt3c_config(struct pcmcia_dev +@@ -710,9 +803,15 @@ static int bt3c_config(struct pcmcia_dev goto failed; found_port: @@ -164,7 +164,7 @@ i = pcmcia_enable_device(link); if (i != 0) -@@ -755,7 +854,13 @@ MODULE_DEVICE_TABLE(pcmcia, bt3c_ids); +@@ -747,7 +846,13 @@ MODULE_DEVICE_TABLE(pcmcia, bt3c_ids); static struct pcmcia_driver bt3c_driver = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch index d35eaad2..05796884 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch @@ -24,7 +24,7 @@ do { info->hdev->stat.byte_rx++; -@@ -295,7 +303,11 @@ static irqreturn_t btuart_interrupt(int +@@ -294,7 +302,11 @@ static irqreturn_t btuart_interrupt(int /* our irq handler is shared */ return IRQ_NONE; @@ -36,7 +36,7 @@ spin_lock(&(info->lock)); -@@ -352,7 +364,11 @@ static void btuart_change_speed(btuart_i +@@ -351,7 +363,11 @@ static void btuart_change_speed(btuart_i return; } @@ -48,7 +48,7 @@ spin_lock_irqsave(&(info->lock), flags); -@@ -471,7 +487,11 @@ static int btuart_hci_ioctl(struct hci_d +@@ -464,7 +480,11 @@ static int btuart_hci_send_frame(struct static int btuart_open(btuart_info_t *info) { unsigned long flags; @@ -60,7 +60,7 @@ struct hci_dev *hdev; spin_lock_init(&(info->lock)); -@@ -538,7 +558,11 @@ static int btuart_open(btuart_info_t *in +@@ -530,7 +550,11 @@ static int btuart_open(btuart_info_t *in static int btuart_close(btuart_info_t *info) { unsigned long flags; @@ -72,7 +72,7 @@ struct hci_dev *hdev = info->hdev; if (!hdev) -@@ -574,8 +598,27 @@ static int btuart_probe(struct pcmcia_de +@@ -566,8 +590,27 @@ static int btuart_probe(struct pcmcia_de info->p_dev = link; link->priv = info; @@ -100,7 +100,7 @@ return btuart_config(link); } -@@ -586,6 +629,7 @@ static void btuart_detach(struct pcmcia_ +@@ -578,6 +621,7 @@ static void btuart_detach(struct pcmcia_ btuart_release(link); } @@ -108,7 +108,7 @@ static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data) { int *try = priv_data; -@@ -624,6 +668,63 @@ static int btuart_check_config_notpicky( +@@ -616,6 +660,63 @@ static int btuart_check_config_notpicky( } return -ENODEV; } @@ -172,7 +172,7 @@ static int btuart_config(struct pcmcia_device *link) { -@@ -647,9 +748,15 @@ static int btuart_config(struct pcmcia_d +@@ -639,9 +740,15 @@ static int btuart_config(struct pcmcia_d goto failed; found_port: @@ -188,7 +188,7 @@ i = pcmcia_enable_device(link); if (i != 0) -@@ -683,7 +790,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids); +@@ -675,7 +782,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids); static struct pcmcia_driver btuart_driver = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch index 1c14c79b..39cb54b8 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch @@ -24,7 +24,7 @@ do { info->hdev->stat.byte_rx++; -@@ -296,7 +304,11 @@ static irqreturn_t dtl1_interrupt(int ir +@@ -295,7 +303,11 @@ static irqreturn_t dtl1_interrupt(int ir /* our irq handler is shared */ return IRQ_NONE; @@ -36,7 +36,7 @@ spin_lock(&(info->lock)); -@@ -451,7 +463,11 @@ static int dtl1_hci_ioctl(struct hci_dev +@@ -444,7 +456,11 @@ static int dtl1_hci_send_frame(struct sk static int dtl1_open(dtl1_info_t *info) { unsigned long flags; @@ -48,7 +48,7 @@ struct hci_dev *hdev; spin_lock_init(&(info->lock)); -@@ -495,8 +511,13 @@ static int dtl1_open(dtl1_info_t *info) +@@ -487,8 +503,13 @@ static int dtl1_open(dtl1_info_t *info) outb(UART_LCR_WLEN8, iobase + UART_LCR); /* Reset DLAB */ outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), iobase + UART_MCR); @@ -62,7 +62,7 @@ /* Turn on interrupts */ outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER); -@@ -521,7 +542,11 @@ static int dtl1_open(dtl1_info_t *info) +@@ -513,7 +534,11 @@ static int dtl1_open(dtl1_info_t *info) static int dtl1_close(dtl1_info_t *info) { unsigned long flags; @@ -74,7 +74,7 @@ struct hci_dev *hdev = info->hdev; if (!hdev) -@@ -557,7 +582,24 @@ static int dtl1_probe(struct pcmcia_devi +@@ -549,7 +574,24 @@ static int dtl1_probe(struct pcmcia_devi info->p_dev = link; link->priv = info; @@ -99,7 +99,7 @@ return dtl1_config(link); } -@@ -571,6 +613,7 @@ static void dtl1_detach(struct pcmcia_de +@@ -563,6 +605,7 @@ static void dtl1_detach(struct pcmcia_de pcmcia_disable_device(link); } @@ -107,7 +107,7 @@ static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data) { if ((p_dev->resource[1]->end) || (p_dev->resource[1]->end < 8)) -@@ -581,6 +624,29 @@ static int dtl1_confcheck(struct pcmcia_ +@@ -573,6 +616,29 @@ static int dtl1_confcheck(struct pcmcia_ return pcmcia_request_io(p_dev); } @@ -137,7 +137,7 @@ static int dtl1_config(struct pcmcia_device *link) { -@@ -588,14 +654,24 @@ static int dtl1_config(struct pcmcia_dev +@@ -580,14 +646,24 @@ static int dtl1_config(struct pcmcia_dev int ret; /* Look for a generic full-sized window */ @@ -162,7 +162,7 @@ ret = pcmcia_enable_device(link); if (ret) -@@ -623,7 +699,13 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids); +@@ -615,7 +691,13 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids); static struct pcmcia_driver dtl1_driver = { .owner = THIS_MODULE, |