Diffstat (limited to 'libopie2/opiebluez/obluetooth.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiebluez/obluetooth.cpp | 43 |
1 files changed, 37 insertions, 6 deletions
diff --git a/libopie2/opiebluez/obluetooth.cpp b/libopie2/opiebluez/obluetooth.cpp index b5df96e..c99a822 100644 --- a/libopie2/opiebluez/obluetooth.cpp +++ b/libopie2/opiebluez/obluetooth.cpp | |||
@@ -104,7 +104,7 @@ void OBluetooth::synchronize() | |||
104 | dl->dev_num = HCI_MAX_DEV; | 104 | dl->dev_num = HCI_MAX_DEV; |
105 | dr = dl->dev_req; | 105 | dr = dl->dev_req; |
106 | 106 | ||
107 | if (ioctl( _fd, HCIGETDEVLIST, (void *) dl) == -1) | 107 | if (::ioctl( _fd, HCIGETDEVLIST, (void *) dl) == -1) |
108 | { | 108 | { |
109 | owarn << "OBluetooth::synchronize() - can't complete HCIGETDEVLIST (" << strerror( errno ) << ")" << oendl; | 109 | owarn << "OBluetooth::synchronize() - can't complete HCIGETDEVLIST (" << strerror( errno ) << ")" << oendl; |
110 | return; | 110 | return; |
@@ -113,13 +113,13 @@ void OBluetooth::synchronize() | |||
113 | for ( int i = 0; i < dl->dev_num; ++i ) | 113 | for ( int i = 0; i < dl->dev_num; ++i ) |
114 | { | 114 | { |
115 | di.dev_id = ( dr + i )->dev_id; | 115 | di.dev_id = ( dr + i )->dev_id; |
116 | if ( ioctl( _fd, HCIGETDEVINFO, (void *) &di) == -1 ) | 116 | if ( ::ioctl( _fd, HCIGETDEVINFO, (void *) &di ) == -1 ) |
117 | { | 117 | { |
118 | owarn << "OBluetooth::synchronize() - can't issue HCIGETDEVINFO on device " << i << " (" << strerror( errno ) << ") - skipping that device. " << oendl; | 118 | owarn << "OBluetooth::synchronize() - can't issue HCIGETDEVINFO on device " << i << " (" << strerror( errno ) << ") - skipping that device. " << oendl; |
119 | continue; | 119 | continue; |
120 | } | 120 | } |
121 | odebug << "OBluetooth::synchronize() - found device #" << di.dev_id << oendl; | 121 | odebug << "OBluetooth::synchronize() - found device #" << di.dev_id << oendl; |
122 | _interfaces.insert( di.name, new OBluetoothInterface( this, di.name, (void*) &di ) ); | 122 | _interfaces.insert( di.name, new OBluetoothInterface( this, di.name, (void*) &di, _fd ) ); |
123 | } | 123 | } |
124 | } | 124 | } |
125 | 125 | ||
@@ -130,17 +130,27 @@ void OBluetooth::synchronize() | |||
130 | class OBluetoothInterface::Private | 130 | class OBluetoothInterface::Private |
131 | { | 131 | { |
132 | public: | 132 | public: |
133 | Private( struct hci_dev_info* di ) | 133 | Private( struct hci_dev_info* di, int fd ) |
134 | { | 134 | { |
135 | ::memcpy( &devinfo, di, sizeof(struct hci_dev_info) ); | 135 | ::memcpy( &devinfo, di, sizeof(struct hci_dev_info) ); |
136 | ctlfd = fd; | ||
137 | } | ||
138 | void reloadInfo() | ||
139 | { | ||
140 | int result = ::ioctl( ctlfd, HCIGETDEVINFO, (void *) &devinfo ); | ||
141 | if ( result == -1 ) | ||
142 | { | ||
143 | owarn << "OBluetoothInterface::Private - can't reload device info (" << strerror( errno ) << ")" << oendl; | ||
144 | } | ||
136 | } | 145 | } |
137 | struct hci_dev_info devinfo; | 146 | struct hci_dev_info devinfo; |
147 | int ctlfd; | ||
138 | }; | 148 | }; |
139 | 149 | ||
140 | OBluetoothInterface::OBluetoothInterface( QObject* parent, const char* name, void* devinfo ) | 150 | OBluetoothInterface::OBluetoothInterface( QObject* parent, const char* name, void* devinfo, int ctlfd ) |
141 | :QObject( parent, name ) | 151 | :QObject( parent, name ) |
142 | { | 152 | { |
143 | d = new OBluetoothInterface::Private( (struct hci_dev_info*) devinfo ); | 153 | d = new OBluetoothInterface::Private( (struct hci_dev_info*) devinfo, ctlfd ); |
144 | } | 154 | } |
145 | 155 | ||
146 | OBluetoothInterface::~OBluetoothInterface() | 156 | OBluetoothInterface::~OBluetoothInterface() |
@@ -158,6 +168,27 @@ QString OBluetoothInterface::macAddress() const | |||
158 | d->devinfo.bdaddr.b[0] ); | 168 | d->devinfo.bdaddr.b[0] ); |
159 | } | 169 | } |
160 | 170 | ||
171 | bool OBluetoothInterface::setUp( bool b ) | ||
172 | { | ||
173 | int cmd = b ? HCIDEVUP : HCIDEVDOWN; | ||
174 | int result = ::ioctl( d->ctlfd, cmd, d->devinfo.dev_id ); | ||
175 | if ( result == -1 && errno != EALREADY ) | ||
176 | { | ||
177 | owarn << "OBluetoothInterface::setUp( " << b << " ) - couldn't change interface state (" << strerror( errno ) << ")" << oendl; | ||
178 | return false; | ||
179 | } | ||
180 | else | ||
181 | { | ||
182 | d->reloadInfo(); | ||
183 | return true; | ||
184 | } | ||
185 | } | ||
186 | |||
187 | bool OBluetoothInterface::isUp() const | ||
188 | { | ||
189 | return hci_test_bit( HCI_UP, &d->devinfo.flags ); | ||
190 | } | ||
191 | |||
161 | } | 192 | } |
162 | } | 193 | } |
163 | 194 | ||