gnokii/include/devices osxbluetooth.h, NONE, 1.1 unixbluetooth.h, 1.5, 1.6

[BORBELY Zoltan <address@hidden>]

Update of /cvsroot/gnokii/gnokii/include/devices
In directory subversions:/tmp/cvs-serv11607/include/devices

Modified Files:
        unixbluetooth.h 
Added Files:
        osxbluetooth.h 
Log Message:
Bluetooth support on Mac OSX


Index: unixbluetooth.h
===================================================================
RCS file: /cvsroot/gnokii/gnokii/include/devices/unixbluetooth.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** unixbluetooth.h     26 Feb 2003 00:15:49 -0000      1.5
--- unixbluetooth.h     20 Nov 2003 21:10:34 -0000      1.6
***************
*** 31,50 ****
  #define _gnokii_unix_bluetooth_h
  
- #ifdef HAVE_BLUETOOTH
- 
- #include <stdlib.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <string.h>
- #include <sys/time.h>
- #include <sys/socket.h>
- 
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/rfcomm.h>
- 
- #endif
- 
  #include "config.h"
  #include "compat.h"
--- 31,34 ----
***************
*** 52,59 ****
  #include "gnokii.h"
  
! #ifdef HAVE_BLUETOOTH
! int bluetooth_open(bdaddr_t *bdaddr, uint8_t channel, struct gn_statemachine 
*state);
! #endif
! 
  int bluetooth_close(int fd, struct gn_statemachine *state);
  int bluetooth_write(int fd, const __ptr_t bytes, int size, struct 
gn_statemachine *state);
--- 36,40 ----
  #include "gnokii.h"
  
! int bluetooth_open(const char *addr, uint8_t channel, struct gn_statemachine 
*state);
  int bluetooth_close(int fd, struct gn_statemachine *state);
  int bluetooth_write(int fd, const __ptr_t bytes, int size, struct 
gn_statemachine *state);

--- NEW FILE: osxbluetooth.h ---
/*

  $Id: osxbluetooth.h,v 1.1 2003/11/20 21:10:34 bozo Exp $

  G N O K I I

  A Linux/Unix toolset and driver for Nokia mobile phones.

  This file is part of gnokii.

  Gnokii 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.

  Gnokii 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 gnokii; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  Copyright (C) 1999, 2000 Hugh Blemings & Pavel Janík ml.
  Copyright (C) 2003       Siegfried Schloissnig

*/

#ifndef _gnokii_osx_bluetooth_h
#define _gnokii_osx_bluetooth_h

#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <sys/time.h>
#include <sys/socket.h>

#include <CoreFoundation/CoreFoundation.h>
#include <IOBluetooth/Bluetooth.h>
#include <IOBluetooth/IOBluetoothUserLib.h>
#include <pthread.h>

typedef struct {
        IOBluetoothRFCOMMChannelRef rfcommChannel;
        IOReturn ioReturnValue;
        pthread_t threadID;

        BluetoothDeviceAddress deviceAddress;
        uint8_t nChannel;

        pthread_mutex_t mutexWait;

        CFMutableArrayRef arrDataReceived;
} threadContext;

typedef struct {
        void *pData;
        unsigned int nSize;
} dataBlock;

#endif /* _gnokii_osx_bluetooth_h */