Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-13 01:54:18 -03:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ChibiOS: add get_device-ptr to HAL DeviceMananger API

Browse Source
This commit is contained in:
Peter Barker 2025-03-04 16:23:30 +11:00 committed by Peter Barker
parent 149641cabc
commit 97f7076e0e
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/AP_HAL_ChibiOS/Device.cpp
View File

@ -17,7 +17,6 @@
#include "Device.h"
#include <AP_HAL/AP_HAL.h>
#include <AP_HAL/utility/OwnPtr.h>
#include <stdio.h>
#if HAL_USE_I2C == TRUE || HAL_USE_SPI == TRUE || HAL_USE_WSPI == TRUE

1
libraries/AP_HAL_ChibiOS/I2CDevice.h
View File

@ -23,7 +23,6 @@
#include <AP_HAL/HAL.h>
#include <AP_HAL/I2CDevice.h>
#include <AP_HAL/utility/OwnPtr.h>
#include "AP_HAL_ChibiOS.h"
#if HAL_USE_I2C == TRUE

9
libraries/AP_HAL_ChibiOS/SPIDevice.cpp
View File

@ -18,7 +18,6 @@
#include <AP_HAL/AP_HAL.h>
#include <AP_Math/AP_Math.h>
#include <AP_HAL/utility/OwnPtr.h>
#include <AP_InternalError/AP_InternalError.h>
#include "Util.h"
#include "Scheduler.h"
@ -445,8 +444,8 @@ bool SPIDevice::set_chip_select(bool set) {
/*
return a SPIDevice given a string device name
*/
AP_HAL::OwnPtr<AP_HAL::SPIDevice>
SPIDeviceManager::get_device(const char *name)
AP_HAL::SPIDevice *
SPIDeviceManager::get_device_ptr(const char *name)
{
/* Find the bus description in the table */
uint8_t i;
@ -456,7 +455,7 @@ SPIDeviceManager::get_device(const char *name)
}
}
if (i == ARRAY_SIZE(device_table)) {
return AP_HAL::OwnPtr<AP_HAL::SPIDevice>(nullptr);
return nullptr;
}
SPIDesc &desc = device_table[i];
@ -480,7 +479,7 @@ SPIDeviceManager::get_device(const char *name)
buses = busp;
}
return AP_HAL::OwnPtr<AP_HAL::SPIDevice>(NEW_NOTHROW SPIDevice(*busp, desc));
return NEW_NOTHROW SPIDevice(*busp, desc);
}
void SPIDeviceManager::set_register_rw_callback(const char* name, AP_HAL::Device::RegisterRWCb cb)

2
libraries/AP_HAL_ChibiOS/SPIDevice.h
View File

@ -177,7 +177,7 @@ public:
return static_cast<SPIDeviceManager*>(spi_mgr);
}
AP_HAL::OwnPtr<AP_HAL::SPIDevice> get_device(const char *name) override;
AP_HAL::SPIDevice *get_device_ptr(const char *name) override;
void set_register_rw_callback(const char* name, AP_HAL::Device::RegisterRWCb cb) override;