Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bluetooth: Remove non-Haiku target platforms logic.

Browse Source
This commit is contained in:
Augustin Cavalier 2018-07-07 17:04:19 -04:00
parent cf5cc3958d
commit b0e0298370
4 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
View File

@ -71,14 +71,8 @@ usb_support_descriptor supported_devices[] = {
};
/* add a device to the list of connected devices */
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
static bt_usb_dev*
spawn_device(usb_device usb_dev)
#else
static bt_usb_dev*
spawn_device(usb_device* usb_dev)
#endif
{
CALLED();
@ -209,12 +203,8 @@ fetch_device(bt_usb_dev* dev, hci_id hid)
#endif
// called by USB Manager when device is added to the USB
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
static status_t
device_added(usb_device dev, void** cookie)
#else
device_added(usb_device* dev, void** cookie)
#endif
{
const usb_interface_info* interface;
const usb_device_descriptor* desc;

9
src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h
View File

@ -12,12 +12,7 @@
#include <net_device.h>
#include <OS.h>
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
#include <USB3.h>
#else
#include <USB_spec.h>
#include <USB.h>
#endif
#include <util/list.h>
#include <bluetooth/HCI/btHCI.h>
@ -61,11 +56,7 @@ extern struct bluetooth_core_data_module_info* btCoreData;
typedef struct bt_usb_dev bt_usb_dev;
struct bt_usb_dev {
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
usb_device dev; /* opaque handle */
#else
usb_device* dev; /* opaque handle */
#endif
hci_id hdev; /* HCI device id*/
bluetooth_device* ndev;

26
src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.cpp
View File

@ -25,17 +25,10 @@
/* Forward declaration */
#ifndef HAIKU_TARGET_PLATFORM_HAIKU
void acl_tx_complete(void* cookie, uint32 status, void* data, uint32 actual_len);
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
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);
void event_complete(void* cookie, status_t status, void* data, size_t actual_len);
#endif
static status_t
@ -53,11 +46,7 @@ assembly_rx(bt_usb_dev* bdev, bt_packet_t type, void* data, int count)
#endif
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 = (bt_usb_dev*)cookie;
// bt_usb_dev* bdev = fetch_device(cookie, 0); -> safer / slower option
@ -99,11 +88,7 @@ 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 = (bt_usb_dev*)cookie;
// bt_usb_dev* bdev = fetch_device(cookie, 0); -> safer / slower option
@ -206,11 +191,7 @@ submit_rx_sco(bt_usb_dev* bdev)
#endif
void
#ifndef HAIKU_TARGET_PLATFORM_HAIKU
command_complete(void* cookie, uint32 status, void* data, uint32 actual_len)
#else
command_complete(void* cookie, status_t status, void* data, size_t actual_len)
#endif
{
snet_buffer* snbuf = (snet_buffer*)cookie;
bt_usb_dev* bdev = (bt_usb_dev*)snb_cookie(snbuf);
@ -235,11 +216,7 @@ command_complete(void* cookie, status_t status, void* data, size_t actual_len)
void
#ifndef HAIKU_TARGET_PLATFORM_HAIKU
acl_tx_complete(void* cookie, uint32 status, void* data, uint32 actual_len)
#else
acl_tx_complete(void* cookie, status_t status, void* data, size_t actual_len)
#endif
{
net_buffer* nbuf = (net_buffer*)cookie;
bt_usb_dev* bdev = GET_DEVICE(nbuf);
@ -287,9 +264,6 @@ submit_tx_command(bt_usb_dev* bdev, snet_buffer* snbuf)
error = usb->queue_request(bdev->dev, bRequestType, bRequest,
value, wIndex, wLength, snb_get(snbuf),
#ifndef HAIKU_TARGET_PLATFORM_HAIKU
wLength,
#endif
command_complete, (void*) snbuf);
if (error != B_OK) {

2
src/servers/bluetooth/DeskbarReplicant.cpp
View File

@ -69,10 +69,8 @@ DeskbarReplicant::_Init()
return;
BResources resources(&file);
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
if (resources.InitCheck() < B_OK)
return;
#endif
size_t size;
const void* data = resources.LoadResource(B_VECTOR_ICON_TYPE,