* [PATCH] usb: r8a66597-udc: add support for set_selfpowered
@ 2012-03-16 4:10 Shimoda, Yoshihiro
2012-04-11 9:35 ` Felipe Balbi
2012-04-11 9:51 ` Shimoda, Yoshihiro
0 siblings, 2 replies; 3+ messages in thread
From: Shimoda, Yoshihiro @ 2012-03-16 4:10 UTC (permalink / raw)
To: linux-sh
The previous code always set to USB_DEVICE_SELF_POWERED in GET_STATUS.
So, this patch adds set_selfpowered().
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
drivers/usb/gadget/r8a66597-udc.c | 16 +++++++++++++++-
drivers/usb/gadget/r8a66597-udc.h | 1 +
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index c4401e7..683b3d2 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -1170,7 +1170,7 @@ __acquires(r8a66597->lock)
switch (ctrl->bRequestType & USB_RECIP_MASK) {
case USB_RECIP_DEVICE:
- status = 1 << USB_DEVICE_SELF_POWERED;
+ status = r8a66597->device_status;
break;
case USB_RECIP_INTERFACE:
status = 0;
@@ -1800,11 +1800,25 @@ static int r8a66597_pullup(struct usb_gadget *gadget, int is_on)
return 0;
}
+static int r8a66597_set_selfpowered(struct usb_gadget *gadget, int is_self)
+{
+ struct r8a66597 *r8a66597 = gadget_to_r8a66597(gadget);
+ unsigned long flags;
+
+ if (is_self)
+ r8a66597->device_status |= 1 << USB_DEVICE_SELF_POWERED;
+ else
+ r8a66597->device_status &= ~(1 << USB_DEVICE_SELF_POWERED);
+
+ return 0;
+}
+
static struct usb_gadget_ops r8a66597_gadget_ops = {
.get_frame = r8a66597_get_frame,
.udc_start = r8a66597_start,
.udc_stop = r8a66597_stop,
.pullup = r8a66597_pullup,
+ .set_selfpowered = r8a66597_set_selfpowered,
};
static int __exit r8a66597_remove(struct platform_device *pdev)
diff --git a/drivers/usb/gadget/r8a66597-udc.h b/drivers/usb/gadget/r8a66597-udc.h
index 8e3de61..8b855a8 100644
--- a/drivers/usb/gadget/r8a66597-udc.h
+++ b/drivers/usb/gadget/r8a66597-udc.h
@@ -111,6 +111,7 @@ struct r8a66597 {
u16 old_vbus;
u16 scount;
u16 old_dvsq;
+ u16 device_status; /* for GET_STATUS */
/* pipe config */
unsigned char bulk;
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] usb: r8a66597-udc: add support for set_selfpowered
2012-03-16 4:10 [PATCH] usb: r8a66597-udc: add support for set_selfpowered Shimoda, Yoshihiro
@ 2012-04-11 9:35 ` Felipe Balbi
2012-04-11 9:51 ` Shimoda, Yoshihiro
1 sibling, 0 replies; 3+ messages in thread
From: Felipe Balbi @ 2012-04-11 9:35 UTC (permalink / raw)
To: linux-sh
[-- Attachment #1: Type: text/plain, Size: 2228 bytes --]
On Fri, Mar 16, 2012 at 01:10:12PM +0900, Shimoda, Yoshihiro wrote:
> The previous code always set to USB_DEVICE_SELF_POWERED in GET_STATUS.
> So, this patch adds set_selfpowered().
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> ---
> drivers/usb/gadget/r8a66597-udc.c | 16 +++++++++++++++-
> drivers/usb/gadget/r8a66597-udc.h | 1 +
> 2 files changed, 16 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
> index c4401e7..683b3d2 100644
> --- a/drivers/usb/gadget/r8a66597-udc.c
> +++ b/drivers/usb/gadget/r8a66597-udc.c
> @@ -1170,7 +1170,7 @@ __acquires(r8a66597->lock)
>
> switch (ctrl->bRequestType & USB_RECIP_MASK) {
> case USB_RECIP_DEVICE:
> - status = 1 << USB_DEVICE_SELF_POWERED;
> + status = r8a66597->device_status;
> break;
> case USB_RECIP_INTERFACE:
> status = 0;
> @@ -1800,11 +1800,25 @@ static int r8a66597_pullup(struct usb_gadget *gadget, int is_on)
> return 0;
> }
>
> +static int r8a66597_set_selfpowered(struct usb_gadget *gadget, int is_self)
> +{
> + struct r8a66597 *r8a66597 = gadget_to_r8a66597(gadget);
> + unsigned long flags;
compile warning here. Did you even test this patch ???
> +
> + if (is_self)
> + r8a66597->device_status |= 1 << USB_DEVICE_SELF_POWERED;
> + else
> + r8a66597->device_status &= ~(1 << USB_DEVICE_SELF_POWERED);
> +
> + return 0;
> +}
> +
> static struct usb_gadget_ops r8a66597_gadget_ops = {
> .get_frame = r8a66597_get_frame,
> .udc_start = r8a66597_start,
> .udc_stop = r8a66597_stop,
> .pullup = r8a66597_pullup,
> + .set_selfpowered = r8a66597_set_selfpowered,
> };
>
> static int __exit r8a66597_remove(struct platform_device *pdev)
> diff --git a/drivers/usb/gadget/r8a66597-udc.h b/drivers/usb/gadget/r8a66597-udc.h
> index 8e3de61..8b855a8 100644
> --- a/drivers/usb/gadget/r8a66597-udc.h
> +++ b/drivers/usb/gadget/r8a66597-udc.h
> @@ -111,6 +111,7 @@ struct r8a66597 {
> u16 old_vbus;
> u16 scount;
> u16 old_dvsq;
> + u16 device_status; /* for GET_STATUS */
>
> /* pipe config */
> unsigned char bulk;
> --
> 1.7.1
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] usb: r8a66597-udc: add support for set_selfpowered
2012-03-16 4:10 [PATCH] usb: r8a66597-udc: add support for set_selfpowered Shimoda, Yoshihiro
2012-04-11 9:35 ` Felipe Balbi
@ 2012-04-11 9:51 ` Shimoda, Yoshihiro
1 sibling, 0 replies; 3+ messages in thread
From: Shimoda, Yoshihiro @ 2012-04-11 9:51 UTC (permalink / raw)
To: linux-sh
2012/04/11 18:35, Felipe Balbi wrote:
> On Fri, Mar 16, 2012 at 01:10:12PM +0900, Shimoda, Yoshihiro wrote:
>> The previous code always set to USB_DEVICE_SELF_POWERED in GET_STATUS.
>> So, this patch adds set_selfpowered().
>>
>> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
>> ---
>> drivers/usb/gadget/r8a66597-udc.c | 16 +++++++++++++++-
>> drivers/usb/gadget/r8a66597-udc.h | 1 +
>> 2 files changed, 16 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
>> index c4401e7..683b3d2 100644
>> --- a/drivers/usb/gadget/r8a66597-udc.c
>> +++ b/drivers/usb/gadget/r8a66597-udc.c
>> @@ -1170,7 +1170,7 @@ __acquires(r8a66597->lock)
>>
>> switch (ctrl->bRequestType & USB_RECIP_MASK) {
>> case USB_RECIP_DEVICE:
>> - status = 1 << USB_DEVICE_SELF_POWERED;
>> + status = r8a66597->device_status;
>> break;
>> case USB_RECIP_INTERFACE:
>> status = 0;
>> @@ -1800,11 +1800,25 @@ static int r8a66597_pullup(struct usb_gadget *gadget, int is_on)
>> return 0;
>> }
>>
>> +static int r8a66597_set_selfpowered(struct usb_gadget *gadget, int is_self)
>> +{
>> + struct r8a66597 *r8a66597 = gadget_to_r8a66597(gadget);
>> + unsigned long flags;
>
> compile warning here. Did you even test this patch ???
I'm sorry, I should have checked it carefully.
I will fix and submit soon.
Best regards,
Yoshihiro Shimoda
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-11 9:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-16 4:10 [PATCH] usb: r8a66597-udc: add support for set_selfpowered Shimoda, Yoshihiro
2012-04-11 9:35 ` Felipe Balbi
2012-04-11 9:51 ` Shimoda, Yoshihiro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).