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

Cleaning whitespaces/tabs and styling

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26803 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Ruiz Dorantes
2008-08-04 20:03:23 +00:00
parent 20a5113818
commit 859039e124
3 changed files with 296 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c
+8 -17
View File
@@ -306,21 +306,17 @@ device_added(const usb_device* dev, void** cookie)
new_bt_dev->intr_in_ep = ep; new_bt_dev->intr_in_ep = ep;
new_bt_dev->max_packet_size_intr_in = ep->descr->max_packet_size; new_bt_dev->max_packet_size_intr_in = ep->descr->max_packet_size;
flowf("INT in\n"); flowf("INT in\n");
} else } else {
{
;
flowf("INT out\n"); flowf("INT out\n");
} }
break; break;
case USB_ENDPOINT_ATTR_BULK: case USB_ENDPOINT_ATTR_BULK:
if (ep->descr->endpoint_address & USB_ENDPOINT_ADDR_DIR_IN) if (ep->descr->endpoint_address & USB_ENDPOINT_ADDR_DIR_IN) {
{
new_bt_dev->bulk_in_ep = ep; new_bt_dev->bulk_in_ep = ep;
new_bt_dev->max_packet_size_bulk_in = ep->descr->max_packet_size;; new_bt_dev->max_packet_size_bulk_in = ep->descr->max_packet_size;;
flowf("BULK int\n"); flowf("BULK int\n");
} else } else {
{
new_bt_dev->bulk_out_ep = ep; new_bt_dev->bulk_out_ep = ep;
new_bt_dev->max_packet_size_bulk_out = ep->descr->max_packet_size;; new_bt_dev->max_packet_size_bulk_out = ep->descr->max_packet_size;;
flowf("BULK out\n"); flowf("BULK out\n");
@@ -452,7 +448,6 @@ device_open(const char *name, uint32 flags, void **cookie)
bdev->nbufferRx[i] = NULL; bdev->nbufferRx[i] = NULL;
} }
// dumping the USB frames // dumping the USB frames
init_room(&bdev->eventRoom); init_room(&bdev->eventRoom);
init_room(&bdev->aclRoom); init_room(&bdev->aclRoom);
@@ -471,8 +466,7 @@ device_open(const char *name, uint32 flags, void **cookie)
bdev->ndev = ndev; bdev->ndev = ndev;
} else } else
hdev = bdev->num; /* XXX: Lets try to go on*/ hdev = bdev->num; /* XXX: Lets try to go on*/
} } else {
else {
hdev = bdev->num; /* XXX: Lets try to go on*/ hdev = bdev->num; /* XXX: Lets try to go on*/
} }
@@ -553,8 +547,7 @@ device_free (void *cookie)
/* GotoLowPower */ /* GotoLowPower */
// interesting ..... // interesting .....
} } else {
else {
/* The last client has closed, and the device is no longer /* The last client has closed, and the device is no longer
connected, so remove it from the list. */ connected, so remove it from the list. */
} }
@@ -641,7 +634,7 @@ device_control(void *cookie, uint32 msg, void *params, size_t size)
flowf("device launched\n"); flowf("device launched\n");
break; break;
case GET_STATICS: case GET_STATS:
memcpy(params, &bdev->stat, sizeof(bt_hci_statistics)); memcpy(params, &bdev->stat, sizeof(bt_hci_statistics));
err = B_OK; err = B_OK;
break; break;
@@ -810,10 +803,8 @@ publish_devices(void)
} }
acquire_sem(dev_table_sem); acquire_sem(dev_table_sem);
for (j = 0; j < MAX_BT_GENERIC_USB_DEVICES; j++) for (j = 0; j < MAX_BT_GENERIC_USB_DEVICES; j++) {
{ if (bt_usb_devices[j] != NULL && bt_usb_devices[j]->connected) {
if (bt_usb_devices[j] != NULL && bt_usb_devices[j]->connected)
{
str = strdup(bt_usb_devices[j]->name); str = strdup(bt_usb_devices[j]->name);
if (str) { if (str) {
publish_names[i++] = str; publish_names[i++] = str;
src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.c
+18 -37
View File
@@ -100,6 +100,7 @@ assembly_rx(bt_usb_dev* bdev, bt_packet_t type, void *data, int count)
break; break;
case BT_SCO: case BT_SCO:
break; break;
default: default:
@@ -109,8 +110,7 @@ assembly_rx(bt_usb_dev* bdev, bt_packet_t type, void *data, int count)
currentPacketLen = expectedPacketLen; currentPacketLen = expectedPacketLen;
} } else {
else {
/* Continuation */ /* Continuation */
if (type != BT_EVENT) if (type != BT_EVENT)
currentPacketLen = get_expected_size(nbuf) - nbuf->size; currentPacketLen = get_expected_size(nbuf) - nbuf->size;
@@ -127,10 +127,8 @@ assembly_rx(bt_usb_dev* bdev, bt_packet_t type, void *data, int count)
/* Complete frame? */ /* Complete frame? */
if (type == BT_EVENT && snb_completed(snbuf)) { if (type == BT_EVENT && snb_completed(snbuf)) {
post_packet_up(bdev, type, snbuf); post_packet_up(bdev, type, snbuf);
snbuf = bdev->eventRx = NULL; snbuf = bdev->eventRx = NULL;
} }
if (type != BT_EVENT && (get_expected_size(nbuf) - nbuf->size) == 0 ) { if (type != BT_EVENT && (get_expected_size(nbuf) - nbuf->size) == 0 ) {
@@ -163,7 +161,6 @@ event_complete(void* cookie, uint32 status, void* data, uint32 actual_len)
event_complete(void* cookie, status_t status, void* data, size_t actual_len) event_complete(void* cookie, status_t status, void* data, size_t actual_len)
#endif #endif
{ {
bt_usb_dev* bdev = cookie; bt_usb_dev* bdev = cookie;
status_t err; status_t err;
@@ -186,12 +183,11 @@ resubmit:
data, bdev->max_packet_size_intr_in , data, bdev->max_packet_size_intr_in ,
event_complete, bdev); event_complete, bdev);
if (err != B_OK ) { if (err != B_OK) {
reuse_room(&bdev->eventRoom, data); reuse_room(&bdev->eventRoom, data);
bdev->stat.rejectedRX++; bdev->stat.rejectedRX++;
debugf("RX event resubmittion failed %s\n",strerror(err)); debugf("RX event resubmittion failed %s\n",strerror(err));
} } else {
else {
bdev->stat.acceptedRX++; bdev->stat.acceptedRX++;
} }
@@ -215,7 +211,7 @@ acl_rx_complete(void* cookie, status_t status, void* data, size_t actual_len)
if (status != B_OK || actual_len == 0) if (status != B_OK || actual_len == 0)
goto resubmit; goto resubmit;
if ( assembly_rx(cookie, BT_ACL, data, actual_len) == B_OK ) { if (assembly_rx(cookie, BT_ACL, data, actual_len) == B_OK) {
bdev->stat.successfulRX++; bdev->stat.successfulRX++;
} else { } else {
bdev->stat.errorRX++; bdev->stat.errorRX++;
@@ -227,22 +223,19 @@ resubmit:
max(HCI_MAX_FRAME_SIZE,bdev->max_packet_size_bulk_in), max(HCI_MAX_FRAME_SIZE,bdev->max_packet_size_bulk_in),
acl_rx_complete, (void*) bdev); acl_rx_complete, (void*) bdev);
if (err != B_OK ) { if (err != B_OK) {
reuse_room(&bdev->aclRoom, data); reuse_room(&bdev->aclRoom, data);
bdev->stat.rejectedRX++; bdev->stat.rejectedRX++;
debugf("RX acl resubmittion failed %s\n", strerror(err)); debugf("RX acl resubmittion failed %s\n", strerror(err));
} } else {
else {
bdev->stat.acceptedRX++; bdev->stat.acceptedRX++;
} }
} }
#if 0 #if 0
#pragma mark --- RX --- #pragma mark --- RX ---
#endif #endif
status_t status_t
submit_rx_event(bt_usb_dev* bdev) submit_rx_event(bt_usb_dev* bdev)
{ {
@@ -256,11 +249,11 @@ submit_rx_event(bt_usb_dev* bdev)
status = usb->queue_interrupt(bdev->intr_in_ep->handle, status = usb->queue_interrupt(bdev->intr_in_ep->handle,
buf, size , buf, size ,
event_complete, (void*) bdev); event_complete, (void*) bdev);
if (status != B_OK ) {
if (status != B_OK) {
reuse_room(&bdev->eventRoom, buf); // reuse allocated one reuse_room(&bdev->eventRoom, buf); // reuse allocated one
bdev->stat.rejectedRX++; bdev->stat.rejectedRX++;
} } else {
else {
bdev->stat.acceptedRX++; bdev->stat.acceptedRX++;
debugf("Accepted RX Event %d\n", bdev->stat.acceptedRX); debugf("Accepted RX Event %d\n", bdev->stat.acceptedRX);
} }
@@ -283,11 +276,10 @@ submit_rx_acl(bt_usb_dev* bdev)
status = usb->queue_bulk(bdev->bulk_in_ep->handle, buf, size , status = usb->queue_bulk(bdev->bulk_in_ep->handle, buf, size ,
acl_rx_complete, bdev); acl_rx_complete, bdev);
if (status != B_OK ) { if (status != B_OK) {
reuse_room(&bdev->aclRoom, buf); // reuse allocated reuse_room(&bdev->aclRoom, buf); // reuse allocated
bdev->stat.rejectedRX++; bdev->stat.rejectedRX++;
} } else {
else {
bdev->stat.acceptedRX++; bdev->stat.acceptedRX++;
} }
@@ -298,7 +290,6 @@ submit_rx_acl(bt_usb_dev* bdev)
status_t status_t
submit_rx_sco(bt_usb_dev* bdev) submit_rx_sco(bt_usb_dev* bdev)
{ {
/* not yet implemented */ /* not yet implemented */
return B_ERROR; return B_ERROR;
} }
@@ -322,11 +313,9 @@ command_complete(void* cookie, status_t status, void* data, size_t actual_len)
debugf("%ld %02x:%02x:%02x:\n", actual_len, ((uint8*)data)[0],((uint8*)data)[1],((uint8*)data)[2]); debugf("%ld %02x:%02x:%02x:\n", actual_len, ((uint8*)data)[0],((uint8*)data)[1],((uint8*)data)[2]);
if (status != B_OK) { if (status != B_OK) {
bdev->stat.successfulTX++; bdev->stat.successfulTX++;
bdev->stat.bytesTX += actual_len; bdev->stat.bytesTX += actual_len;
} } else {
else {
bdev->stat.errorTX++; bdev->stat.errorTX++;
/* the packet has been lost */ /* the packet has been lost */
/* too late to requeue it? */ /* too late to requeue it? */
@@ -347,9 +336,7 @@ acl_tx_complete(void* cookie, uint32 status, void* data, uint32 actual_len)
#else #else
acl_tx_complete(void* cookie, status_t status, void* data, size_t actual_len) acl_tx_complete(void* cookie, status_t status, void* data, size_t actual_len)
#endif #endif
{ {
net_buffer* nbuf = (net_buffer*) cookie; net_buffer* nbuf = (net_buffer*) cookie;
bt_usb_dev* bdev = GET_DEVICE(nbuf); bt_usb_dev* bdev = GET_DEVICE(nbuf);
@@ -357,8 +344,7 @@ acl_tx_complete(void* cookie, status_t status, void* data, size_t actual_len)
bdev->stat.successfulTX++; bdev->stat.successfulTX++;
bdev->stat.bytesTX += actual_len; bdev->stat.bytesTX += actual_len;
} } else {
else {
bdev->stat.errorTX++; bdev->stat.errorTX++;
/* the packet has been lost */ /* the packet has been lost */
/* too late to requeue it? */ /* too late to requeue it? */
@@ -370,7 +356,6 @@ acl_tx_complete(void* cookie, status_t status, void* data, size_t actual_len)
#endif #endif
} }
#if 0 #if 0
#pragma mark --- TX --- #pragma mark --- TX ---
#endif #endif
@@ -386,7 +371,7 @@ submit_tx_command(bt_usb_dev* bdev, snet_buffer* snbuf)
uint16 value = 0; uint16 value = 0;
uint16 wLength = B_HOST_TO_LENDIAN_INT16(snb_size(snbuf)); uint16 wLength = B_HOST_TO_LENDIAN_INT16(snb_size(snbuf));
if (!GET_BIT(bdev->state, RUNNING) ) { if (!GET_BIT(bdev->state, RUNNING)) {
return B_DEV_NOT_READY; return B_DEV_NOT_READY;
} }
@@ -400,8 +385,7 @@ submit_tx_command(bt_usb_dev* bdev, snet_buffer* snbuf)
if (err != B_OK ) { if (err != B_OK ) {
bdev->stat.rejectedTX++; bdev->stat.rejectedTX++;
} } else {
else {
bdev->stat.acceptedTX++; bdev->stat.acceptedTX++;
} }
@@ -420,15 +404,13 @@ submit_tx_acl(bt_usb_dev* bdev, net_buffer* nbuf)
return B_DEV_NOT_READY; return B_DEV_NOT_READY;
} }
err = usb->queue_bulk(bdev->bulk_out_ep->handle, err = usb->queue_bulk(bdev->bulk_out_ep->handle,
nb_get_whole_buffer(nbuf), nbuf->size, nb_get_whole_buffer(nbuf), nbuf->size,
acl_tx_complete, (void*) nbuf); acl_tx_complete, (void*) nbuf);
if (err != B_OK ) { if (err != B_OK ) {
bdev->stat.rejectedTX++; bdev->stat.rejectedTX++;
} } else {
else {
bdev->stat.acceptedTX++; bdev->stat.acceptedTX++;
} }
@@ -440,11 +422,10 @@ status_t
submit_tx_sco(bt_usb_dev* bdev) submit_tx_sco(bt_usb_dev* bdev)
{ {
if (!GET_BIT(bdev->state, RUNNING) ) { if (!GET_BIT(bdev->state, RUNNING)) {
return B_DEV_NOT_READY; return B_DEV_NOT_READY;
} }
/* not yet implemented */ /* not yet implemented */
return B_ERROR; return B_ERROR;
} }
src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.c
+1 -4
View File
@@ -43,7 +43,6 @@ snb_create(uint16 size)
snb->expectedSize = snb->allocatedSize = size; snb->expectedSize = snb->allocatedSize = size;
return snb; return snb;
} }
@@ -170,8 +169,7 @@ snb_attempt_reuse(snet_buffer* snb, uint16 size)
snb_free(snb); snb_free(snb);
return snb_create(size); return snb_create(size);
} } else {
else {
snb_reset(snb); snb_reset(snb);
snb->expectedSize = size; snb->expectedSize = size;
return snb; return snb;
@@ -195,7 +193,6 @@ snb_park(struct list* l, snet_buffer* snb)
snet_buffer* snet_buffer*
snb_fetch(struct list* l, uint16 size) snb_fetch(struct list* l, uint16 size)
{ {
snet_buffer* item = NULL; snet_buffer* item = NULL;
snet_buffer* previous = NULL; snet_buffer* previous = NULL;