NeonXP/bluetooth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

macos: remove unnecessary pointer indirection on service and char maps

Browse source
This commit is contained in:
Baden Parr 2023-06-06 15:49:10 +12:00 committed by Ron Evans
parent a341e8f543
commit eb782c5841
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gap_darwin.go
View file

@ -93,7 +93,7 @@ type Device struct {
servicesChan chan error
charsChan chan error
services map[UUID]*DeviceService
services map[UUID]DeviceService
}
// Connect starts a connection attempt to the given peripheral device address.

10
gattc_darwin.go
View file

@ -18,7 +18,7 @@ func (d *Device) DiscoverServices(uuids []UUID) ([]DeviceService, error) {
d.prph.DiscoverServices([]cbgo.UUID{})
// clear cache of services
d.services = make(map[UUID]*DeviceService)
d.services = make(map[UUID]DeviceService)
// wait on channel for service discovery
select {
@ -49,7 +49,7 @@ func (d *Device) DiscoverServices(uuids []UUID) ([]DeviceService, error) {
},
}
svcs = append(svcs, svc)
d.services[svc.uuidWrapper] = &svc
d.services[svc.uuidWrapper] = svc
}
return svcs, nil
case <-time.NewTimer(10 * time.Second).C:
@ -72,7 +72,7 @@ type deviceService struct {
device *Device
service cbgo.Service
characteristics map[UUID]*DeviceCharacteristic
characteristics map[UUID]DeviceCharacteristic
}
// UUID returns the UUID for this DeviceService.
@ -95,7 +95,7 @@ func (s *DeviceService) DiscoverCharacteristics(uuids []UUID) ([]DeviceCharacter
s.device.prph.DiscoverCharacteristics(cbuuids, s.service)
// clear cache of characteristics
s.characteristics = make(map[UUID]*DeviceCharacteristic)
s.characteristics = make(map[UUID]DeviceCharacteristic)
// wait on channel for characteristic discovery
select {
@ -150,7 +150,7 @@ func (s *DeviceService) makeCharacteristic(uuid UUID, dchar cbgo.Characteristic)
characteristic: dchar,
},
}
s.characteristics[char.uuidWrapper] = &char
s.characteristics[char.uuidWrapper] = char
return char
}