mirror of
git://projects.qi-hardware.com/ben-wpan.git
synced 2025-04-21 12:27:27 +03:00
Merged uSD driver into unified tool build, completed conversion of tools.
- atusd/tools/lib/atusd.c: moved to tools/lib/ - atusd/tools/lib/atusd.h: removed, we can now use tools/include/atspi.h - tools/lib/atusd.c: added copyright header - tools/lib/atusd.c: updated for driver API - tools/lib/Makefile: added atusd.o - tools/Makefile.common: moved common elements from all other makefiles in tools/*/ here - tools/Makefile.common: added target-specific compiler and flags - tools/atspi-id/Makefile, tools/atspi-reset/Makefile, tools/atspi-rssi/Makefile, tools/atspi-trim/Makefile, tools/atspi-txrx/Makefile, tools/lib/Makefile: used Makefile.common - tools/lib/Makefile: differentiate USB and uSD build - tools/atspi-id/atspi-id.c, tools/atspi-reset/atspi-reset.c, tools/atspi-rssi/atspi-rssi.c, tools/atspi-trim/atspi-trim.c, tools/atspi-txr/atspi-txr.c: updated for driver-agnostic API - tools/atspi-id/atspi-id.c, tools/atspi-reset/atspi-reset.c, tools/atspi-rssi/atspi-rssi.c, tools/atspi-trim/atspi-trim.c, tools/atspi-txr/atspi-txr.c: corrected AF86RF230 typo in title - tools/include/atspi.h, tools/lib/atspi.c, tools/lib/driver.c, tools/lib/atusb.c: brought back support for atspi_error and atspi_clear_error - tools/atspi-id/atspi-id.c (atspi_get_protocol): renamed to get_protocol, to make it clear that it's not from libatspi - tools/atspi-id/atspi-id.c (atspi_get_build): renamed to get_build, to make it clear that it's not from libatspi - tools/include/atspi.h, tools/lib/atspi.c (atspi_usb_handle): new function to obtain a driver's USB device handle (or NULL if the driver doesn't use USB)
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
|
||||
|
||||
extern struct atspi_driver atusb_driver;
|
||||
extern struct atspi_driver atusd_driver;
|
||||
|
||||
|
||||
struct atspi_dsc {
|
||||
@@ -27,13 +28,42 @@ struct atspi_dsc {
|
||||
};
|
||||
|
||||
|
||||
void *atspi_usb_handle(struct atspi_dsc *dsc)
|
||||
{
|
||||
#ifdef HAVE_USB
|
||||
return dsc->handle;
|
||||
#else
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
int atspi_error(struct atspi_dsc *dsc)
|
||||
{
|
||||
return dsc->driver->error ? dsc->driver->error(dsc->handle) : 0;
|
||||
}
|
||||
|
||||
|
||||
int atspi_clear_error(struct atspi_dsc *dsc)
|
||||
{
|
||||
return dsc->driver->clear_error ?
|
||||
dsc->driver->clear_error(dsc->handle) : 0;
|
||||
}
|
||||
|
||||
|
||||
struct atspi_dsc *atspi_open(void)
|
||||
{
|
||||
struct atspi_dsc *dsc;
|
||||
struct atspi_driver *driver;
|
||||
void *handle;
|
||||
|
||||
#ifdef HAVE_USB
|
||||
driver = &atusb_driver;
|
||||
#elif HAVE_USD
|
||||
driver = &atusd_driver;
|
||||
#else
|
||||
#error Need either HAVE_USB or HAVE_USD
|
||||
#endif
|
||||
handle = driver->open();
|
||||
if (!handle)
|
||||
return NULL;
|
||||
|
||||
Reference in New Issue
Block a user