From 74516e06e79cd7c789395d790b79f8dc6e847f50 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Mon, 19 Dec 2011 23:10:41 +0000 Subject: usb-drv-as3525v2: revert part of r31243 assigning a partially initialized structure (through casting) will initialize members unspecified in the initialization git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31372 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/as3525/usb-drv-as3525v2.c | 33 ++++++++++++--------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c index c0542d5c45..a96d0d1596 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525v2.c +++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c @@ -116,13 +116,12 @@ static void reset_endpoints(void) for (unsigned i = 0; i < num_eps(dir == DIR_OUT); i++) { int ep = ((dir == DIR_IN) ? in_ep_list : out_ep_list)[i]; - endpoints[ep][out] = (struct usb_endpoint) { - .active = false, - .busy = false, - .status = -1, - .done = false, - }; - semaphore_release(&endpoints[ep][out].complete); + struct usb_endpoint *endpoint = &endpoints[ep][out]; + endpoint->active = false; + endpoint->busy = false; + endpoint->status = -1; + endpoint->done = false; + semaphore_release(&endpoint->complete); if (i != 0) DEPCTL(ep, out) = DEPCTL_setd0pid; @@ -149,12 +148,11 @@ static void cancel_all_transfers(bool cancel_ep0) for (unsigned i = !!cancel_ep0; i < num_eps(dir == DIR_OUT); i++) { int ep = ((dir == DIR_IN) ? in_ep_list : out_ep_list)[i]; - endpoints[ep][dir == DIR_OUT] = (struct usb_endpoint) { - .status = -1, - .busy = false, - .done = false, - }; - semaphore_release(&endpoints[ep][dir == DIR_OUT].complete); + struct usb_endpoint *endpoint = &endpoints[ep][dir == DIR_OUT]; + endpoint->status = -1; + endpoint->busy = false; + endpoint->done = false; + semaphore_release(&endpoint->complete); DEPCTL(ep, dir) = (DEPCTL(ep, dir) & ~DEPCTL_usbactep); } @@ -429,11 +427,10 @@ static void usb_drv_transfer(int ep, void *ptr, int len, bool out) /* disable interrupts to avoid any race */ int oldlevel = disable_irq_save(); - endpoints[ep][out ? DIR_OUT : DIR_IN] = (struct usb_endpoint) { - .busy = true, - .len = len, - .status = -1, - }; + struct usb_endpoint *endpoint = &endpoints[ep][out ? DIR_OUT : DIR_IN]; + endpoint->busy = true; + endpoint->len = len; + endpoint->status = -1; if (out) DEPCTL(ep, out) &= ~DEPCTL_naksts; -- cgit v1.2.3