From 59f3001ca5d48daa2583d1b1546ef6c90232c569 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 3 Feb 2009 01:33:48 +0100 Subject: pull in new SBC/BT files --- src/modules/bluetooth/ipc.c | 2 +- src/modules/bluetooth/ipc.h | 7 ++----- src/modules/bluetooth/rtp.h | 2 +- src/modules/bluetooth/sbc_primitives_mmx.c | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) (limited to 'src/modules') diff --git a/src/modules/bluetooth/ipc.c b/src/modules/bluetooth/ipc.c index 67785309..f14c92c4 100644 --- a/src/modules/bluetooth/ipc.c +++ b/src/modules/bluetooth/ipc.c @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2008 Marcel Holtmann + * Copyright (C) 2004-2009 Marcel Holtmann * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/modules/bluetooth/ipc.h b/src/modules/bluetooth/ipc.h index 0e985c3a..4203150b 100644 --- a/src/modules/bluetooth/ipc.h +++ b/src/modules/bluetooth/ipc.h @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2008 Marcel Holtmann + * Copyright (C) 2004-2009 Marcel Holtmann * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -98,8 +98,6 @@ typedef struct { #define BT_NEW_STREAM 2 #define BT_START_STREAM 3 #define BT_STOP_STREAM 4 -#define BT_SUSPEND_STREAM 5 -#define BT_RESUME_STREAM 6 #define BT_CONTROL 7 #define BT_CAPABILITIES_TRANSPORT_A2DP 0 @@ -120,7 +118,7 @@ struct bt_get_capabilities_req { } __attribute__ ((packed)); /** - * SBC Codec parameters as per A2DP profile 1.0 § 4.3 + * SBC Codec parameters as per A2DP profile 1.0 § 4.3 */ #define BT_A2DP_CODEC_SBC 0x00 @@ -198,7 +196,6 @@ typedef struct { uint16_t sampling_rate; } __attribute__ ((packed)) pcm_capabilities_t; - struct bt_get_capabilities_rsp { bt_audio_msg_header_t h; uint8_t data[0]; /* First codec_capabilities_t */ diff --git a/src/modules/bluetooth/rtp.h b/src/modules/bluetooth/rtp.h index e4881a71..14573628 100644 --- a/src/modules/bluetooth/rtp.h +++ b/src/modules/bluetooth/rtp.h @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2008 Marcel Holtmann + * Copyright (C) 2004-2009 Marcel Holtmann * * * This library is free software; you can redistribute it and/or diff --git a/src/modules/bluetooth/sbc_primitives_mmx.c b/src/modules/bluetooth/sbc_primitives_mmx.c index 7db4af72..1870a9ba 100644 --- a/src/modules/bluetooth/sbc_primitives_mmx.c +++ b/src/modules/bluetooth/sbc_primitives_mmx.c @@ -275,7 +275,7 @@ static inline void sbc_analyze_4b_8s_mmx(int16_t *x, int32_t *out, asm volatile ("emms\n"); } -static int check_mmx_support() +static int check_mmx_support(void) { #ifdef __amd64__ return 1; /* We assume that all 64-bit processors have MMX support */ -- cgit