From f72093d92924010bf284a1c022c185ecca985f45 Mon Sep 17 00:00:00 2001 From: Oliver Ruiz Dorantes Date: Wed, 13 Feb 2008 20:07:51 +0000 Subject: [PATCH] Make the driver almost build for target R5. How is the best way in the Jamfile to compile it together with src/system/kernel/util/list.c only for target R5? git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23957 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../bluetooth/h2/h2generic/h2transactions.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.c b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.c index b9637837c2..a1d3c9db40 100644 --- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.c +++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.c @@ -30,7 +30,6 @@ void acl_rx_complete(void* cookie, uint32 status, void* data, uint32 actual_len) void command_complete(void* cookie, uint32 status, void* data, uint32 actual_len); void event_complete(void* cookie, uint32 status, void* data, uint32 actual_len); #else -/* TODO: propagate this definitions */ void acl_tx_complete(void* cookie, status_t status, void* data, size_t actual_len); void acl_rx_complete(void* cookie, status_t status, void* data, size_t actual_len); void command_complete(void* cookie, status_t status, void* data, size_t actual_len); @@ -167,7 +166,11 @@ assembly_rx(bt_usb_dev* bdev, bt_packet_t type, void *data, int count) void +#ifndef HAIKU_TARGET_PLATFORM_HAIKU +event_complete(void* cookie, uint32 status, void* data, uint32 actual_len) +#else event_complete(void* cookie, status_t status, void* data, size_t actual_len) +#endif { bt_usb_dev* bdev = cookie; @@ -201,8 +204,13 @@ resubmit: } + void +#ifndef HAIKU_TARGET_PLATFORM_HAIKU +acl_rx_complete(void* cookie, uint32 status, void* data, uint32 actual_len) +#else acl_rx_complete(void* cookie, status_t status, void* data, size_t actual_len) +#endif { bt_usb_dev* bdev = cookie; status_t err; @@ -234,10 +242,12 @@ resubmit: } } + #if 0 #pragma mark --- RX --- #endif + status_t submit_rx_event(bt_usb_dev* bdev) { @@ -304,12 +314,11 @@ submit_rx_sco(bt_usb_dev* bdev) #pragma mark --- TX Complete --- #endif -#ifndef HAIKU void -command_complete(void* cookie, status_t status, void* data, size_t actual_len) +#ifndef HAIKU_TARGET_PLATFORM_HAIKU +command_complete(void* cookie, uint32 status, void* data, uint32 actual_len) #else -void -command_complete(void* cookie, uint32 status, void* data, size_t actual_len) +command_complete(void* cookie, status_t status, void* data, size_t actual_len) #endif { snet_buffer* snbuf = (snet_buffer*) cookie;