author | mickeyl <mickeyl> | 2005-07-11 14:05:50 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-07-11 14:05:50 (UTC) |
commit | de58c11168d02f5e52624e68529c9e2eac7978f6 (patch) (side-by-side diff) | |
tree | 8fdaf84de66d55259344ee1708cf753f5162e2b8 /libopie2 | |
parent | 4a7503c5e64101a5fadcf8003e66bf447d796f95 (diff) | |
download | opie-de58c11168d02f5e52624e68529c9e2eac7978f6.zip opie-de58c11168d02f5e52624e68529c9e2eac7978f6.tar.gz opie-de58c11168d02f5e52624e68529c9e2eac7978f6.tar.bz2 |
don't link to libbluez since this would taint LGPL
-rw-r--r-- | libopie2/opiebluez/obluetooth.cpp | 13 | ||||
-rw-r--r-- | libopie2/opiebluez/obluetooth.h | 2 | ||||
-rw-r--r-- | libopie2/opiebluez/opiebluez.pro | 6 |
3 files changed, 6 insertions, 15 deletions
diff --git a/libopie2/opiebluez/obluetooth.cpp b/libopie2/opiebluez/obluetooth.cpp index a161f86..fbc4f0a 100644 --- a/libopie2/opiebluez/obluetooth.cpp +++ b/libopie2/opiebluez/obluetooth.cpp @@ -24,49 +24,49 @@ -- :-=` 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 { +namespace Bluez { /*====================================================================================== * 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 @@ -94,68 +94,63 @@ void OBluetooth::synchronize() 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; + //ba2str( &d->devinfo.bdaddr, addr); + //return addr; + return "BLA"; } } } diff --git a/libopie2/opiebluez/obluetooth.h b/libopie2/opiebluez/obluetooth.h index 30fdd18..10c8c49 100644 --- a/libopie2/opiebluez/obluetooth.h +++ b/libopie2/opiebluez/obluetooth.h @@ -13,49 +13,49 @@ .%`+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 { +namespace Bluez { 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; /** diff --git a/libopie2/opiebluez/opiebluez.pro b/libopie2/opiebluez/opiebluez.pro index 6a37dee..8a52928 100644 --- a/libopie2/opiebluez/opiebluez.pro +++ b/libopie2/opiebluez/opiebluez.pro @@ -1,27 +1,23 @@ TEMPLATE = lib CONFIG += qt warn_on DESTDIR = $(OPIEDIR)/lib HEADERS = obluetooth.h \ SOURCES = obluetooth.cpp \ INTERFACES = TARGET = opiebluez2 VERSION = 0.0.0 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lopiecore2 -lbluetooth +LIBS += -lopiecore2 !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 -} - |