summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-07-10 18:23:38 (UTC)
committer mickeyl <mickeyl>2005-07-10 18:23:38 (UTC)
commit71fc7a0b9722b1a9695049f2885d5247449fbd6c (patch) (side-by-side diff)
tree4006dff6f7333e72156426b7740a5ea725accc3a
parent779359497a582d510da0448f41a14e44db6b52af (diff)
downloadopie-71fc7a0b9722b1a9695049f2885d5247449fbd6c.zip
opie-71fc7a0b9722b1a9695049f2885d5247449fbd6c.tar.gz
opie-71fc7a0b9722b1a9695049f2885d5247449fbd6c.tar.bz2
s/opieshower/opiebluez/, infrared better goes through opienet
there's the need of a connection abstraction library which bases on opienet and opiebluez in the future. It's for discussion if it makes sense in Opie 1.x
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--examples/examples.pro2
-rw-r--r--libopie2/libopie2.pro2
-rw-r--r--libopie2/opiebluez/.cvsignore6
-rw-r--r--libopie2/opiebluez/config.in7
-rw-r--r--libopie2/opiebluez/obluetooth.cpp161
-rw-r--r--libopie2/opiebluez/obluetooth.h141
-rw-r--r--libopie2/opiebluez/opiebluez.pro29
7 files changed, 346 insertions, 2 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index fd83a9b..864ab67 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -11,8 +11,8 @@ SUBDIRS = applet \
todayplugin \
opiecore \
opiedb \
opiemm \
opienet \
opieui \
- opieshower
+ opiebluez
diff --git a/libopie2/libopie2.pro b/libopie2/libopie2.pro
index f131a9b..964caca 100644
--- a/libopie2/libopie2.pro
+++ b/libopie2/libopie2.pro
@@ -1,8 +1,8 @@
TEMPLATE = subdirs
-unix:SUBDIRS = opiecore opiedb opiepim opieui opienet opiemm opiesecurity opieshower
+unix:SUBDIRS = opiecore opiedb opiepim opieui opienet opiemm opiesecurity opiebluez
!contains( platform, x11 ) {
message( Configuring libopie2 for build on Opie )
include( $(OPIEDIR)/include.pro )
}
diff --git a/libopie2/opiebluez/.cvsignore b/libopie2/opiebluez/.cvsignore
new file mode 100644
index 0000000..972e959
--- a/dev/null
+++ b/libopie2/opiebluez/.cvsignore
@@ -0,0 +1,6 @@
+Makefile*
+moc*
+*moc
+*.o
+~*
+obj
diff --git a/libopie2/opiebluez/config.in b/libopie2/opiebluez/config.in
new file mode 100644
index 0000000..502181b
--- a/dev/null
+++ b/libopie2/opiebluez/config.in
@@ -0,0 +1,7 @@
+ config LIBOPIE2BLUEZ
+ boolean "libopie2bluez (Linux Bluetooth subsystem BlueZ related classes)"
+ default "y"
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBBLUEZ_DEP
+ comment "libopie2net needs a libqpe, libopie2core, and libbluez"
+ depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBBLUEZ_DEP)
+
diff --git a/libopie2/opiebluez/obluetooth.cpp b/libopie2/opiebluez/obluetooth.cpp
new file mode 100644
index 0000000..a161f86
--- a/dev/null
+++ b/libopie2/opiebluez/obluetooth.cpp
@@ -0,0 +1,161 @@
+/*
+ This file is part of the Opie Project
+ Copyright (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
+ =. Copyright (C) The Opie Team <opie-devel@handhelds.org>
+ .=l.
+           .>+-=
+ _;:,     .>    :=|. This program is free software; you can
+.> <`_,   >  .   <= redistribute it and/or modify it under
+:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
+.="- .-=="i,     .._ License as published by the Free Software
+ - .   .-<_>     .<> Foundation; version 2 of the license.
+     ._= =}       :
+    .%`+i>       _;_.
+    .i_,=:_.      -<s. 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
+..}^=.=       =       ; Library General Public License for more
+++=   -.     .`     .: details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<; You should have received a copy of the GNU
+  -_. . .   )=.  = Library General Public License along with
+    --        :-=` this library; see the file COPYING.LIB.
+ If not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+#include "obluetooth.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* STD */
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+#include <bluetooth/hci_lib.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+namespace Opie {
+namespace Shower {
+
+/*======================================================================================
+ * OBluetooth
+ *======================================================================================*/
+
+OBluetooth* OBluetooth::_instance = 0;
+
+OBluetooth::OBluetooth()
+{
+ synchronize();
+}
+
+OBluetooth* OBluetooth::instance()
+{
+ if ( !_instance ) _instance = new OBluetooth();
+ return _instance;
+}
+
+OBluetooth::InterfaceIterator OBluetooth::iterator() const
+{
+ return OBluetooth::InterfaceIterator( _interfaces );
+}
+
+int OBluetooth::count() const
+{
+ return _interfaces.count();
+}
+
+OBluetoothInterface* OBluetooth::interface( const QString& iface ) const
+{
+ return _interfaces[iface];
+}
+
+void OBluetooth::synchronize()
+{
+ odebug << "OBluetooth::synchronize() - gathering available HCI devices" << oendl;
+ _interfaces.clear();
+
+ _fd = ::socket( AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI );
+ if ( _fd == -1 )
+ {
+ owarn << "OBluetooth::synchronize() - can't open HCI control socket (" << strerror( errno ) << ")" << oendl;
+ return;
+ }
+
+ struct hci_dev_list_req *dl;
+ struct hci_dev_req *dr;
+ struct hci_dev_info di;
+
+ if (!(dl = (struct hci_dev_list_req*)malloc(HCI_MAX_DEV * sizeof(struct hci_dev_req) + sizeof(uint16_t))))
+ {
+ ofatal << "OBluetooth::synchronize() - can't allocate memory for HCI request" << oendl;
+ return;
+ }
+
+ dl->dev_num = HCI_MAX_DEV;
+ dr = dl->dev_req;
+
+ if (ioctl( _fd, HCIGETDEVLIST, (void *) dl) == -1)
+ {
+ owarn << "OBluetooth::synchronize() - can't complete HCIGETDEVLIST (" << strerror( errno ) << ")" << oendl;
+ return;
+ }
+
+ for ( int i = 0; i < dl->dev_num; ++i )
+ {
+ di.dev_id = ( dr + i )->dev_id;
+ if ( ioctl( _fd, HCIGETDEVINFO, (void *) &di) < 0 )
+ continue;
+ if ( hci_test_bit(HCI_RAW, &di.flags) && !bacmp(&di.bdaddr, BDADDR_ANY))
+ {
+ int dd = hci_open_dev(di.dev_id);
+ hci_read_bd_addr(dd, &di.bdaddr, 1000);
+ hci_close_dev(dd);
+ }
+ odebug << "OBluetooth::synchronize() - found device #" << di.dev_id << oendl;
+ _interfaces.insert( di.name, new OBluetoothInterface( this, di.name, (void*) &di ) );
+ }
+}
+
+/*======================================================================================
+ * OBluetoothInterface
+ *======================================================================================*/
+
+class OBluetoothInterface::Private
+{
+ public:
+ Private( struct hci_dev_info* di )
+ {
+ ::memcpy( &devinfo, di, sizeof(struct hci_dev_info) );
+ }
+ struct hci_dev_info devinfo;
+};
+
+OBluetoothInterface::OBluetoothInterface( QObject* parent, const char* name, void* devinfo )
+{
+ d = new OBluetoothInterface::Private( (struct hci_dev_info*) devinfo );
+}
+
+OBluetoothInterface::~OBluetoothInterface()
+{
+}
+
+QString OBluetoothInterface::macAddress() const
+{
+ char addr[18];
+ ba2str( &d->devinfo.bdaddr, addr);
+ return addr;
+}
+
+}
+}
+
diff --git a/libopie2/opiebluez/obluetooth.h b/libopie2/opiebluez/obluetooth.h
new file mode 100644
index 0000000..30fdd18
--- a/dev/null
+++ b/libopie2/opiebluez/obluetooth.h
@@ -0,0 +1,141 @@
+/*
+ This file is part of the Opie Project
+ Copyright (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
+ =. Copyright (C) The Opie Team <opie-devel@handhelds.org>
+ .=l.
+           .>+-=
+ _;:,     .>    :=|. This program is free software; you can
+.> <`_,   >  .   <= redistribute it and/or modify it under
+:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
+.="- .-=="i,     .._ License as published by the Free Software
+ - .   .-<_>     .<> Foundation; version 2 of the License.
+     ._= =}       :
+    .%`+i>       _;_.
+    .i_,=:_.      -<s. 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
+..}^=.=       =       ; Library General Public License for more
+++=   -.     .`     .: details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<; You should have received a copy of the GNU
+  -_. . .   )=.  = Library General Public License along with
+    --        :-=` this library; see the file COPYING.LIB.
+ If not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+#ifndef OBLUETOOTH_H
+#define OBLUETOOTH_H
+
+#include <qobject.h>
+#include <qdict.h>
+
+namespace Opie {
+namespace Shower {
+
+class OBluetoothInterface;
+
+/**
+ * @brief A container class for all bluetooth interfaces
+ *
+ * This class provides access to all available bluetooth interfaces of your computer.
+ *
+ * @author Michael 'Mickey' Lauer <mickey@vanille.de>
+ */
+class OBluetooth : public QObject
+{
+ Q_OBJECT
+
+ public:
+ typedef QDict<OBluetoothInterface> InterfaceMap;
+ typedef QDictIterator<OBluetoothInterface> InterfaceIterator;
+
+ public:
+ /**
+ * @returns the number of available interfaces
+ */
+ int count() const;
+ /**
+ * @returns a pointer to the (one and only) @ref OBluetooth instance.
+ */
+ static OBluetooth* instance();
+ /**
+ * @returns an iterator usable for iterating through all network interfaces.
+ */
+ InterfaceIterator iterator() const;
+ /**
+ * @returns true, if the @a interface is present.
+ */
+ bool isPresent( const char* interface ) const;
+ /**
+ * @returns true, if the @a interface supports the wireless extension protocol.
+ */
+ bool isWirelessInterface( const char* interface ) const;
+ /**
+ * @returns a pointer to the @ref OBluetoothInterface object for the specified @a interface or 0, if not found.
+ * @see OBluetoothInterface
+ */
+ OBluetoothInterface* interface( const QString& interface ) const;
+ /**
+ * @internal Rebuild the internal interface database
+ * @note Sometimes it might be useful to call this from client code,
+ * e.g. after issuing a cardctl insert
+ */
+ void synchronize();
+
+ protected:
+ OBluetooth();
+
+ private:
+ static OBluetooth* _instance;
+ InterfaceMap _interfaces;
+ class OBluetoothPrivate;
+ OBluetoothPrivate *d;
+ int _fd;
+};
+
+/*======================================================================================
+ * OBluetoothInterface
+ *======================================================================================*/
+
+/**
+ * @brief An bluetooth interface wrapper.
+ *
+ * This class provides a wrapper for an infrared interface. All the cumbersome details of
+ * Linux ioctls are hidden under a convenient high-level interface.
+ * @warning Most of the setting methods contained in this class require the appropriate
+ * process permissions to work.
+ *
+ * @author Michael 'Mickey' Lauer <mickey@vanille.de>
+ */
+class OBluetoothInterface : public QObject
+{
+ public:
+ /**
+ * Constructor. Normally you don't create @ref OBluetoothInterface objects yourself,
+ * but access them via @ref OBluetooth::interface().
+ */
+ OBluetoothInterface( QObject* parent, const char* name, void* devinfo );
+ /**
+ * Destructor.
+ */
+ virtual ~OBluetoothInterface();
+ /**
+ * @return the MAC address of the interfaces
+ */
+ QString macAddress() const;
+
+ private:
+ class Private;
+ Private *d;
+};
+
+
+
+}
+}
+#endif
+
diff --git a/libopie2/opiebluez/opiebluez.pro b/libopie2/opiebluez/opiebluez.pro
new file mode 100644
index 0000000..bcd2df2
--- a/dev/null
+++ b/libopie2/opiebluez/opiebluez.pro
@@ -0,0 +1,29 @@
+TEMPLATE = lib
+CONFIG += qt warn_on
+DESTDIR = $(OPIEDIR)/lib
+HEADERS = obluetooth.h \
+ oinfrared.h
+SOURCES = obluetooth.cpp \
+ oinfrared.cpp
+INTERFACES =
+TARGET = opieshower2
+VERSION = 0.0.0
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
+LIBS += -lopiecore2 -lbluetooth
+
+!contains( platform, x11 ) {
+ include( $(OPIEDIR)/include.pro )
+}
+
+contains( platform, x11 ) {
+ LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
+}
+
+!isEmpty( LIBBLUEZ_INC_DIR ) {
+ INCLUDEPATH = $$LIBBLUEZ_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBBLUEZ_LIB_DIR ) {
+ LIBS = -L$$LIBBLUEZ_LIB_DIR $$LIBS
+}
+