Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Unified Diff: device/bluetooth/bluetooth_low_energy_win.cc

Issue 1690133002: Implement BluetoothRemoteGattServiceWin and related unit tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/bluetooth_low_energy_win.cc
diff --git a/device/bluetooth/bluetooth_low_energy_win.cc b/device/bluetooth/bluetooth_low_energy_win.cc
index 29932b9301e258b97ff4241e14b1148fcff7fbc9..68b8005759316f8d8e93a673f1d203455ca137d3 100644
--- a/device/bluetooth/bluetooth_low_energy_win.cc
+++ b/device/bluetooth/bluetooth_low_energy_win.cc
@@ -719,5 +719,88 @@ bool BluetoothLowEnergyWrapper::EnumerateKnownBluetoothLowEnergyServices(
return CollectBluetoothLowEnergyDeviceServices(device_path, services, error);
}
+HRESULT BluetoothLowEnergyWrapper::ReadIncludedServicesOfAService(
+ base::FilePath& service_path,
+ const PBTH_LE_GATT_SERVICE service,
+ scoped_ptr<BTH_LE_GATT_SERVICE>* out_included_services,
+ USHORT* out_counts) {
+ HRESULT hr = S_OK;
+ base::File file(service_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
+ if (!file.IsValid()) {
+ hr = HRESULT_FROM_WIN32(ERROR_OPEN_FAILED);
+ return hr;
+ }
+
+ USHORT required_length = 0;
+ hr = BluetoothGATTGetIncludedServices(file.GetPlatformFile(), service, 0,
+ NULL, &required_length,
+ BLUETOOTH_GATT_FLAG_NONE);
+ if (hr != HRESULT_FROM_WIN32(ERROR_MORE_DATA)) {
+ return hr;
+ }
+
+ (*out_included_services).reset(new BTH_LE_GATT_SERVICE[required_length]);
ortuno 2016/02/19 17:33:05 You do this in a couple of places: why don't use a
gogerald1 2016/02/19 22:45:02 Done.
+ USHORT actual_length = required_length;
+ hr = BluetoothGATTGetIncludedServices(
+ file.GetPlatformFile(), service, actual_length,
+ (*out_included_services).get(), &required_length,
+ BLUETOOTH_GATT_FLAG_NONE);
+ if (SUCCEEDED(hr) && required_length != actual_length) {
+ LOG(ERROR) << "Retrieved included services is not equal to expected"
+ << " actual_length " << actual_length << " required_length "
+ << required_length;
+ hr = HRESULT_FROM_WIN32(ERROR_INVALID_USER_BUFFER);
+ }
+ *out_counts = actual_length;
+
+ if (FAILED(hr)) {
+ (*out_included_services).reset(nullptr);
+ *out_counts = 0;
+ }
+ return hr;
+}
+
+HRESULT BluetoothLowEnergyWrapper::ReadCharacteristicsOfAService(
+ base::FilePath& service_path,
+ const PBTH_LE_GATT_SERVICE service,
+ scoped_ptr<BTH_LE_GATT_CHARACTERISTIC>* out_included_characteristics,
+ USHORT* out_counts) {
+ HRESULT hr = S_OK;
+ base::File file(service_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
+ if (!file.IsValid()) {
+ hr = HRESULT_FROM_WIN32(ERROR_OPEN_FAILED);
+ return hr;
+ }
+
+ USHORT required_length = 0;
+ hr = BluetoothGATTGetCharacteristics(file.GetPlatformFile(), service, 0, NULL,
+ &required_length,
+ BLUETOOTH_GATT_FLAG_NONE);
+ if (hr != HRESULT_FROM_WIN32(ERROR_MORE_DATA)) {
+ return hr;
+ }
+
+ (*out_included_characteristics)
+ .reset(new BTH_LE_GATT_CHARACTERISTIC[required_length]);
+ USHORT actual_length = required_length;
+ hr = BluetoothGATTGetCharacteristics(
+ file.GetPlatformFile(), service, actual_length,
+ (*out_included_characteristics).get(), &required_length,
+ BLUETOOTH_GATT_FLAG_NONE);
+ if (SUCCEEDED(hr) && required_length != actual_length) {
+ LOG(ERROR) << "Retrieved charactersitics is not equal to expected"
+ << " actual_length " << actual_length << " required_length "
+ << required_length;
+ hr = HRESULT_FROM_WIN32(ERROR_INVALID_USER_BUFFER);
+ }
+ *out_counts = actual_length;
+
+ if (FAILED(hr)) {
+ (*out_included_characteristics).reset(nullptr);
+ *out_counts = 0;
+ }
+ return hr;
+}
+
} // namespace win
} // namespace device

Powered by Google App Engine
This is Rietveld 408576698