i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bluetooth: fix build.

Browse Source 
Fixes #11184.
This commit is contained in:
Adrien Destugues
2014-11-07 21:24:04 +01:00
parent 2c291e65bd
commit a12bde1cf5
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
+4 -3
View File
@@ -664,7 +664,7 @@ device_control(void* cookie, uint32 msg, void* params, size_t size)
// EVENTS // EVENTS
err = submit_rx_event(bdev); err = submit_rx_event(bdev);
if (err != B_OK) { if (err != B_OK) {
CLEAR_BIT(bdev->state, ANCILLYANT); bdev->state = CLEAR_BIT(bdev->state, ANCILLYANT);
flowf("Queuing failed device stops running\n"); flowf("Queuing failed device stops running\n");
break; break;
} }
@@ -673,14 +673,15 @@ device_control(void* cookie, uint32 msg, void* params, size_t size)
for (i = 0; i < MAX_ACL_IN_WINDOW; i++) { for (i = 0; i < MAX_ACL_IN_WINDOW; i++) {
err = submit_rx_acl(bdev); err = submit_rx_acl(bdev);
if (err != B_OK && i == 0) { if (err != B_OK && i == 0) {
CLEAR_BIT(bdev->state, ANCILLYANT); // Set the flaq in the HCI world bdev->state = CLEAR_BIT(bdev->state, ANCILLYANT);
// Set the flaq in the HCI world
flowf("Queuing failed device stops running\n"); flowf("Queuing failed device stops running\n");
break; break;
} }
} }
#endif #endif
SET_BIT(bdev->state, RUNNING); bdev->state = SET_BIT(bdev->state, RUNNING);
#if BT_DRIVER_SUPPORTS_SCO #if BT_DRIVER_SUPPORTS_SCO
// TODO: SCO / eSCO // TODO: SCO / eSCO
src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.cpp
+8 -8
View File
@@ -16,11 +16,11 @@
#include "snet_buffer.h" #include "snet_buffer.h"
#define BT_DEBUG_THIS_MODULE #define BT_DEBUG_THIS_MODULE
#include <btDebug.h> #include <btDebug.h>
// TODO: split for commands and comunication (ACL & SCO) // TODO: split for commands and comunication (ACL & SCO)
void void
sched_tx_processing(bt_usb_dev* bdev) sched_tx_processing(bt_usb_dev* bdev)
{ {
net_buffer* nbuf; net_buffer* nbuf;
@@ -36,7 +36,7 @@ sched_tx_processing(bt_usb_dev* bdev)
/* Do while this bit is on... so someone should set it before we /* Do while this bit is on... so someone should set it before we
* stop the iterations * stop the iterations
*/ */
CLEAR_BIT(bdev->state, SENDING); bdev->state = CLEAR_BIT(bdev->state, SENDING);
// check Commands // check Commands
#ifdef EMPTY_COMMAND_QUEUE #ifdef EMPTY_COMMAND_QUEUE
while (!list_is_empty(&bdev->nbuffersTx[BT_COMMAND])) { while (!list_is_empty(&bdev->nbuffersTx[BT_COMMAND])) {
@@ -66,7 +66,7 @@ sched_tx_processing(bt_usb_dev* bdev)
err = submit_tx_acl(bdev, nbuf); err = submit_tx_acl(bdev, nbuf);
if (err != B_OK) { if (err != B_OK) {
// re-head it // re-head it
list_insert_item_before(&bdev->nbuffersTx[BT_ACL], list_insert_item_before(&bdev->nbuffersTx[BT_ACL],
list_get_first_item(&bdev->nbuffersTx[BT_ACL]), list_get_first_item(&bdev->nbuffersTx[BT_ACL]),
nbuf); nbuf);
} }
@@ -77,19 +77,19 @@ sched_tx_processing(bt_usb_dev* bdev)
} }
} while (GET_BIT(bdev->state, SENDING)); } while (GET_BIT(bdev->state, SENDING));
CLEAR_BIT(bdev->state, PROCESSING); bdev->state = CLEAR_BIT(bdev->state, PROCESSING);
} else { } else {
// We are processing so MARK that we need to still go on with that // We are processing so MARK that we need to still go on with that
SET_BIT(bdev->state, SENDING); bdev->state = SET_BIT(bdev->state, SENDING);
} }
} }
#if 0 #if 0
// DEPRECATED // DEPRECATED
status_t status_t
post_packet_up(bt_usb_dev* bdev, bt_packet_t type, void* buf) post_packet_up(bt_usb_dev* bdev, bt_packet_t type, void* buf)
{ {
status_t err = B_ERROR; status_t err = B_ERROR;