Merge pull request #196 from dismirlian/master

USBH updates

11 files changed, 25 insertions, 12 deletions

diff --git a/os/hal/include/hal_usbh.h b/os/hal/include/hal_usbh.h
index 1ed6416..aa49205 100644
--- a/os/hal/include/hal_usbh.h
+++ b/os/hal/include/hal_usbh.h
@@ -1,6 +1,6 @@
 /*
     ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio
-              Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)
+              Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -52,7 +52,9 @@
 #define HAL_USBH_USE_ADDITIONAL_CLASS_DRIVERS	FALSE
 #endif
 
+#ifndef HAL_USBH_USE_IAD
 #define HAL_USBH_USE_IAD     HAL_USBH_USE_UVC
+#endif
 
 #if (HAL_USE_USBH == TRUE) || defined(__DOXYGEN__)
 
@@ -299,11 +301,22 @@ extern "C" {
 	}
 
 	/* Synchronous API */
-	usbh_urbstatus_t usbhBulkTransfer(usbh_ep_t *ep,
+	usbh_urbstatus_t usbhSynchronousTransfer(usbh_ep_t *ep,
 			void *data,
 			uint32_t len,
 			uint32_t *actual_len,
 			systime_t timeout);
+
+	static inline usbh_urbstatus_t usbhBulkTransfer(usbh_ep_t *ep,
+			void *data,
+			uint32_t len,
+			uint32_t *actual_len,
+			systime_t timeout) {
+		osalDbgAssert(ep->type == USBH_EPTYPE_BULK, "wrong ep");
+
+		return usbhSynchronousTransfer(ep, data, len, actual_len, timeout);
+	}
+
 	usbh_urbstatus_t usbhControlRequest(usbh_device_t *dev,
 			uint8_t bmRequestType,
 			uint8_t bRequest,
diff --git a/os/hal/include/usbh/debug.h b/os/hal/include/usbh/debug.h
index d3bdee7..41319b9 100644
--- a/os/hal/include/usbh/debug.h
+++ b/os/hal/include/usbh/debug.h
@@ -1,6 +1,6 @@
 /*

     ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio

-              Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)

+              Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail)

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/hal/include/usbh/defs.h b/os/hal/include/usbh/defs.h
index 5e0c466..eb06192 100644
--- a/os/hal/include/usbh/defs.h
+++ b/os/hal/include/usbh/defs.h
@@ -1,6 +1,6 @@
 /*

     ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio

-              Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)

+              Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail)

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/hal/include/usbh/desciter.h b/os/hal/include/usbh/desciter.h
index 142bd3c..0223101 100644
--- a/os/hal/include/usbh/desciter.h
+++ b/os/hal/include/usbh/desciter.h
@@ -1,6 +1,6 @@
 /*

     ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio

-              Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)

+              Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail)

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/hal/include/usbh/dev/aoa.h b/os/hal/include/usbh/dev/aoa.h
index a7f1c1b..8205dd5 100644
--- a/os/hal/include/usbh/dev/aoa.h
+++ b/os/hal/include/usbh/dev/aoa.h
@@ -1,6 +1,6 @@
 /*
     ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio
-              Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)
+              Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/os/hal/include/usbh/dev/ftdi.h b/os/hal/include/usbh/dev/ftdi.h
index eedb056..84ea4bc 100644
--- a/os/hal/include/usbh/dev/ftdi.h
+++ b/os/hal/include/usbh/dev/ftdi.h
@@ -1,6 +1,6 @@
 /*

     ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio

-              Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)

+              Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail)

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/hal/include/usbh/dev/hid.h b/os/hal/include/usbh/dev/hid.h
index c7371ee..de001ab 100644
--- a/os/hal/include/usbh/dev/hid.h
+++ b/os/hal/include/usbh/dev/hid.h
@@ -1,6 +1,6 @@
 /*
     ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio
-              Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)
+              Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/os/hal/include/usbh/dev/hub.h b/os/hal/include/usbh/dev/hub.h
index 406fbaf..05a7b4f 100644
--- a/os/hal/include/usbh/dev/hub.h
+++ b/os/hal/include/usbh/dev/hub.h
@@ -1,6 +1,6 @@
 /*

     ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio

-              Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)

+              Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail)

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/hal/include/usbh/dev/msd.h b/os/hal/include/usbh/dev/msd.h
index eedd474..b245bfc 100644
--- a/os/hal/include/usbh/dev/msd.h
+++ b/os/hal/include/usbh/dev/msd.h
@@ -1,6 +1,6 @@
 /*

     ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio

-              Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)

+              Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail)

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/hal/include/usbh/dev/uvc.h b/os/hal/include/usbh/dev/uvc.h
index 0477312..713d16c 100644
--- a/os/hal/include/usbh/dev/uvc.h
+++ b/os/hal/include/usbh/dev/uvc.h
@@ -1,6 +1,6 @@
 /*
     ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio
-              Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)
+              Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/os/hal/include/usbh/internal.h b/os/hal/include/usbh/internal.h
index f6f17b7..2473775 100644
--- a/os/hal/include/usbh/internal.h
+++ b/os/hal/include/usbh/internal.h
@@ -1,6 +1,6 @@
 /*

     ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio

-              Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)

+              Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail)

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.