From d2269527b744e0ab249d38663436613158b0a282 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Tue, 12 Sep 2017 16:55:01 +0200 Subject: implement ptxfe_int for outbound INT ep --- os/hal/src/hal_usbh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'os/hal/src/hal_usbh.c') diff --git a/os/hal/src/hal_usbh.c b/os/hal/src/hal_usbh.c index 7dff98a..10c5c03 100644 --- a/os/hal/src/hal_usbh.c +++ b/os/hal/src/hal_usbh.c @@ -338,7 +338,7 @@ usbh_urbstatus_t usbhBulkTransfer(usbh_ep_t *ep, osalDbgCheck(ep != NULL); osalDbgCheck((data != NULL) || (len == 0)); - osalDbgAssert(ep->type == USBH_EPTYPE_BULK, "wrong ep"); + // osalDbgAssert(ep->type == USBH_EPTYPE_BULK, "wrong ep"); usbh_urb_t urb; usbhURBObjectInit(&urb, ep, 0, 0, data, len); -- cgit v1.2.3 From f5f3c8ffdb666682868c0280995f2a5fb8c62aa3 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Thu, 14 Sep 2017 14:41:28 +0200 Subject: usbh:_ptxfe_int, use HPTXSTS, introduce usbhSyncrhonousTransfer --- os/hal/src/hal_usbh.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'os/hal/src/hal_usbh.c') diff --git a/os/hal/src/hal_usbh.c b/os/hal/src/hal_usbh.c index 10c5c03..a7ceedf 100644 --- a/os/hal/src/hal_usbh.c +++ b/os/hal/src/hal_usbh.c @@ -335,10 +335,19 @@ usbh_urbstatus_t usbhBulkTransfer(usbh_ep_t *ep, uint32_t len, uint32_t *actual_len, systime_t timeout) { + osalDbgAssert(ep->type == USBH_EPTYPE_BULK, "wrong ep"); + + return usbhSyncrhonousTransfer(ep,data,len,actual_len,timeout); +} + +usbh_urbstatus_t usbhSyncrhonousTransfer(usbh_ep_t *ep, + void *data, + uint32_t len, + uint32_t *actual_len, + systime_t timeout) { osalDbgCheck(ep != NULL); osalDbgCheck((data != NULL) || (len == 0)); - // osalDbgAssert(ep->type == USBH_EPTYPE_BULK, "wrong ep"); usbh_urb_t urb; usbhURBObjectInit(&urb, ep, 0, 0, data, len); -- cgit v1.2.3 From 741459ac27f9efb158ff28860c5d8e9affb87b68 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Thu, 14 Sep 2017 17:36:21 +0200 Subject: usbh:correct spelling of usbhSynchronousTransfer --- os/hal/src/hal_usbh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'os/hal/src/hal_usbh.c') diff --git a/os/hal/src/hal_usbh.c b/os/hal/src/hal_usbh.c index a7ceedf..3949c68 100644 --- a/os/hal/src/hal_usbh.c +++ b/os/hal/src/hal_usbh.c @@ -337,10 +337,10 @@ usbh_urbstatus_t usbhBulkTransfer(usbh_ep_t *ep, systime_t timeout) { osalDbgAssert(ep->type == USBH_EPTYPE_BULK, "wrong ep"); - return usbhSyncrhonousTransfer(ep,data,len,actual_len,timeout); + return usbhSynchronousTransfer(ep,data,len,actual_len,timeout); } -usbh_urbstatus_t usbhSyncrhonousTransfer(usbh_ep_t *ep, +usbh_urbstatus_t usbhSynchronousTransfer(usbh_ep_t *ep, void *data, uint32_t len, uint32_t *actual_len, -- cgit v1.2.3 From 06af5833ed2253ff1334e0143692657085acf04c Mon Sep 17 00:00:00 2001 From: Diego Ismirlian Date: Sun, 29 Oct 2017 17:41:30 -0300 Subject: USBH: main driver: implement usbhBulkTransfer as inline function --- os/hal/src/hal_usbh.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'os/hal/src/hal_usbh.c') diff --git a/os/hal/src/hal_usbh.c b/os/hal/src/hal_usbh.c index 3949c68..f9f4687 100644 --- a/os/hal/src/hal_usbh.c +++ b/os/hal/src/hal_usbh.c @@ -330,16 +330,6 @@ void _usbh_urb_completeI(usbh_urb_t *urb, usbh_urbstatus_t status) { /* Synchronous API. */ /*===========================================================================*/ -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 usbhSynchronousTransfer(usbh_ep_t *ep, void *data, uint32_t len, -- cgit v1.2.3 From 61dfc26804aba33384ff57876f76b3f9031eb7c2 Mon Sep 17 00:00:00 2001 From: Diego Ismirlian Date: Sun, 19 Nov 2017 21:17:56 -0300 Subject: USBH: improve disconnection detection; added a necessary reschedule. --- os/hal/src/hal_usbh.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'os/hal/src/hal_usbh.c') diff --git a/os/hal/src/hal_usbh.c b/os/hal/src/hal_usbh.c index f9f4687..78ac837 100644 --- a/os/hal/src/hal_usbh.c +++ b/os/hal/src/hal_usbh.c @@ -302,6 +302,7 @@ msg_t usbhURBSubmitAndWaitS(usbh_urb_t *urb, systime_t timeout) { _check_urb(urb); usbhURBSubmitI(urb); + osalOsRescheduleS(); /* This call is necessary because usbhURBSubmitI may require a reschedule */ ret = usbhURBWaitTimeoutS(urb, timeout); if (ret == MSG_TIMEOUT) _usbh_urb_abort_and_waitS(urb, USBH_URBSTATUS_TIMEOUT); @@ -859,9 +860,7 @@ static void _port_process_status_change(usbh_port_t *port) { usbhhubClearFeaturePort(port, USBH_PORT_FEAT_C_CONNECTION); if (port->device.status != USBH_DEVSTATUS_DISCONNECTED) { - if (!(port->status & USBH_PORTSTATUS_CONNECTION)) { - _usbh_port_disconnected(port); - } + _usbh_port_disconnected(port); } } -- cgit v1.2.3 From eb10a7d52faa133a699d859322246f654ccd9042 Mon Sep 17 00:00:00 2001 From: Diego Ismirlian Date: Sun, 29 Sep 2019 19:31:05 -0300 Subject: Update copyright --- os/hal/src/hal_usbh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'os/hal/src/hal_usbh.c') diff --git a/os/hal/src/hal_usbh.c b/os/hal/src/hal_usbh.c index 78ac837..feaf956 100644 --- a/os/hal/src/hal_usbh.c +++ b/os/hal/src/hal_usbh.c @@ -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. -- cgit v1.2.3