From 0097d93ac82733bae644a0be3c6ad0eab6cff4db Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 26 May 2007 16:31:17 +0000 Subject: Add unix.c and unix.h skeletons --- audio/unix.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 audio/unix.h (limited to 'audio/unix.h') diff --git a/audio/unix.h b/audio/unix.h new file mode 100644 index 00000000..e87dd676 --- /dev/null +++ b/audio/unix.h @@ -0,0 +1,22 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2004-2007 Marcel Holtmann + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ -- cgit From d2d76421ad539e2c6da87e4b4fd2a42493053f49 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Sat, 26 May 2007 17:17:34 +0000 Subject: Move unix socket functionality into unix.c --- audio/unix.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'audio/unix.h') diff --git a/audio/unix.h b/audio/unix.h index e87dd676..4f3fc994 100644 --- a/audio/unix.h +++ b/audio/unix.h @@ -20,3 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ + +int unix_init(void); + +void unix_exit(void); -- cgit From eb0899c1c7137ece8c0e5e5ec031cb2b9b4262e3 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 18 Jun 2007 21:08:35 +0000 Subject: Make deprecated headset methods to rely on new device methods. --- audio/unix.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'audio/unix.h') diff --git a/audio/unix.h b/audio/unix.h index 4f3fc994..15da23ab 100644 --- a/audio/unix.h +++ b/audio/unix.h @@ -21,6 +21,9 @@ * */ +#include "ipc.h" + int unix_init(void); void unix_exit(void); +int unix_send_cfg(int sock, struct ipc_packet *pkt); -- cgit From 66d48b0ac25c85de354f26782a377d0ad91bd322 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Tue, 10 Jul 2007 13:34:57 +0000 Subject: Code cleanup. --- audio/unix.h | 1 + 1 file changed, 1 insertion(+) (limited to 'audio/unix.h') diff --git a/audio/unix.h b/audio/unix.h index 15da23ab..32cf4af9 100644 --- a/audio/unix.h +++ b/audio/unix.h @@ -27,3 +27,4 @@ int unix_init(void); void unix_exit(void); int unix_send_cfg(int sock, struct ipc_packet *pkt); +int unix_send_status(int sock, struct ipc_packet *pkt); -- cgit From 6763ebb3c231740c66a235f94d56e8d8cc213d90 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Sat, 11 Aug 2007 11:05:24 +0000 Subject: Integrate A2DP work from Johan's and Luiz's GIT trees --- audio/unix.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'audio/unix.h') diff --git a/audio/unix.h b/audio/unix.h index 32cf4af9..c771b965 100644 --- a/audio/unix.h +++ b/audio/unix.h @@ -24,7 +24,6 @@ #include "ipc.h" int unix_init(void); - void unix_exit(void); -int unix_send_cfg(int sock, struct ipc_packet *pkt); -int unix_send_status(int sock, struct ipc_packet *pkt); + +int unix_send_cfg(int sock, struct ipc_data_cfg *cfg); -- cgit From 9494c146cec1df466c2f331957748beeac8d745a Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Sat, 11 Aug 2007 15:52:27 +0000 Subject: Remove redundant stream fd from config response --- audio/unix.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'audio/unix.h') diff --git a/audio/unix.h b/audio/unix.h index c771b965..83e2518a 100644 --- a/audio/unix.h +++ b/audio/unix.h @@ -26,4 +26,4 @@ int unix_init(void); void unix_exit(void); -int unix_send_cfg(int sock, struct ipc_data_cfg *cfg); +int unix_send_cfg(int sock, struct ipc_data_cfg *cfg, int fd); -- cgit From c2833e263d6cfc4cf82f4bfdcc59640a4071aeae Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 13 Aug 2007 08:14:22 +0000 Subject: Remove ifndef protections and includes from .h files --- audio/unix.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'audio/unix.h') diff --git a/audio/unix.h b/audio/unix.h index 83e2518a..7f42688c 100644 --- a/audio/unix.h +++ b/audio/unix.h @@ -21,8 +21,6 @@ * */ -#include "ipc.h" - int unix_init(void); void unix_exit(void); -- cgit From e1bfc91de96a38616100cc31db7bdb69f2cfbea6 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 27 Aug 2007 11:31:01 +0000 Subject: Convert alsa initiated headset connections to similar callback system that A2DP is already using --- audio/unix.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'audio/unix.h') diff --git a/audio/unix.h b/audio/unix.h index 7f42688c..feea855f 100644 --- a/audio/unix.h +++ b/audio/unix.h @@ -23,5 +23,3 @@ int unix_init(void); void unix_exit(void); - -int unix_send_cfg(int sock, struct ipc_data_cfg *cfg, int fd); -- cgit From de72271829f6bfd21aa6550a2ac6d81e35b53cad Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 23 Oct 2007 17:17:47 +0000 Subject: Update copyright information --- audio/unix.h | 1 + 1 file changed, 1 insertion(+) (limited to 'audio/unix.h') diff --git a/audio/unix.h b/audio/unix.h index feea855f..69fd3a4d 100644 --- a/audio/unix.h +++ b/audio/unix.h @@ -2,6 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * + * Copyright (C) 2006-2007 Nokia Corporation * Copyright (C) 2004-2007 Marcel Holtmann * * -- cgit From e823c15e43a6f924779e466d434c51157002d9ee Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 2 Feb 2008 03:37:05 +0000 Subject: Update copyright information --- audio/unix.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'audio/unix.h') diff --git a/audio/unix.h b/audio/unix.h index 69fd3a4d..62474509 100644 --- a/audio/unix.h +++ b/audio/unix.h @@ -3,7 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2006-2007 Nokia Corporation - * Copyright (C) 2004-2007 Marcel Holtmann + * Copyright (C) 2004-2008 Marcel Holtmann * * * This program is free software; you can redistribute it and/or modify -- cgit