diff options
author | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-03 14:00:34 -0300 |
---|---|---|
committer | Diego Ismirlian <dismirlian@gmail.com> | 2019-10-03 14:00:34 -0300 |
commit | ea844db44656f481cda59bc71234d54be37ed5bf (patch) | |
tree | 22c21b29afc393b5813b58776cfa728e90f1b916 /os/hal/include/usbh/dev | |
parent | 2800f71230de7684cb805701ac40791f5d0876b6 (diff) | |
parent | 75027a647490d62d875c8012c0eac83a441304a8 (diff) | |
download | ChibiOS-Contrib-ea844db44656f481cda59bc71234d54be37ed5bf.tar.gz ChibiOS-Contrib-ea844db44656f481cda59bc71234d54be37ed5bf.tar.bz2 ChibiOS-Contrib-ea844db44656f481cda59bc71234d54be37ed5bf.zip |
Merge branch 'master' into segger_systemview
Diffstat (limited to 'os/hal/include/usbh/dev')
-rw-r--r-- | os/hal/include/usbh/dev/aoa.h | 1 | ||||
-rw-r--r-- | os/hal/include/usbh/dev/ftdi.h | 2 | ||||
-rw-r--r-- | os/hal/include/usbh/dev/msd.h | 3 | ||||
-rw-r--r-- | os/hal/include/usbh/dev/uvc.h | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/os/hal/include/usbh/dev/aoa.h b/os/hal/include/usbh/dev/aoa.h index 8205dd5..1f36370 100644 --- a/os/hal/include/usbh/dev/aoa.h +++ b/os/hal/include/usbh/dev/aoa.h @@ -130,6 +130,7 @@ typedef bool (*usbhaoa_filter_callback_t)(usbh_device_t *dev, const uint8_t *des #define usbhaoaGetState(aoap) ((aoap)->state) #define usbhaoaGetChannelState(aoap) ((aoap)->channel.state) +#define usbhaoaGetHost(aoap) ((aoap)->dev->host) /*===========================================================================*/ /* External declarations. */ diff --git a/os/hal/include/usbh/dev/ftdi.h b/os/hal/include/usbh/dev/ftdi.h index 84ea4bc..fdd767d 100644 --- a/os/hal/include/usbh/dev/ftdi.h +++ b/os/hal/include/usbh/dev/ftdi.h @@ -127,7 +127,7 @@ struct USBHFTDIDriver { /* Driver macros. */
/*===========================================================================*/
#define usbhftdipGetState(ftdipp) ((ftdipp)->state)
-
+#define usbhftdipGetHost(ftdipp) ((ftdipp)->ftdip->dev->host)
/*===========================================================================*/
/* External declarations. */
diff --git a/os/hal/include/usbh/dev/msd.h b/os/hal/include/usbh/dev/msd.h index b245bfc..113f523 100644 --- a/os/hal/include/usbh/dev/msd.h +++ b/os/hal/include/usbh/dev/msd.h @@ -72,7 +72,6 @@ struct USBHMassStorageLUNDriver { /* Driver macros. */
/*===========================================================================*/
-
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
@@ -95,6 +94,8 @@ extern "C" { bool usbhmsdLUNGetInfo(USBHMassStorageLUNDriver *lunp, BlockDeviceInfo *bdip);
bool usbhmsdLUNIsInserted(USBHMassStorageLUNDriver *lunp);
bool usbhmsdLUNIsProtected(USBHMassStorageLUNDriver *lunp);
+
+ USBHDriver *usbhmsdLUNGetHost(const USBHMassStorageLUNDriver *lunp);
#ifdef __cplusplus
}
#endif
diff --git a/os/hal/include/usbh/dev/uvc.h b/os/hal/include/usbh/dev/uvc.h index 713d16c..7116c91 100644 --- a/os/hal/include/usbh/dev/uvc.h +++ b/os/hal/include/usbh/dev/uvc.h @@ -408,9 +408,9 @@ extern "C" { const uint8_t *framedesc, uint32_t dwFrameInterval); #if USBH_DEBUG_ENABLE && USBHUVC_DEBUG_ENABLE_INFO - void usbhuvcPrintProbeCommit(const usbh_uvc_ctrl_vs_probecommit_data_t *pc); + void usbhuvcPrintProbeCommit(USBHUVCDriver *uvcdp, const usbh_uvc_ctrl_vs_probecommit_data_t *pc); #else -# define usbhuvcPrintProbeCommit(pc) do {} while(0) +# define usbhuvcPrintProbeCommit(uvcdp, pc) do {} while(0) #endif bool usbhuvcProbe(USBHUVCDriver *uvcdp); bool usbhuvcCommit(USBHUVCDriver *uvcdp); |