Fixed wrong adaption to CMSIS 4.5 in bootloader

cmaglie · cmaglie · commit 7ebd62a841e2 · 2016-12-20T15:00:25.000+01:00
diff --git a/bootloaders/zero/sam_ba_usb.c b/bootloaders/zero/sam_ba_usb.c
@@ -344,7 +344,7 @@ void sam_ba_usb_CDC_Enumerate(P_USB_CDC pCdc)
             pUsb->DEVICE.DeviceEndpoint[wIndex].EPSTATUSCLR.reg = USB_DEVICE_EPSTATUSCLR_STALLRQ1;
             if (pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.bit.STALL1)
             {
-              pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.bit.STALL1;
+              pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_STALL1;
               // The Stall has occurred, then reset data toggle
               pUsb->DEVICE.DeviceEndpoint[wIndex].EPSTATUSCLR.reg = USB_DEVICE_EPSTATUSSET_DTGLIN;
             }
@@ -358,7 +358,7 @@ void sam_ba_usb_CDC_Enumerate(P_USB_CDC pCdc)
             pUsb->DEVICE.DeviceEndpoint[wIndex].EPSTATUSCLR.reg = USB_DEVICE_EPSTATUSCLR_STALLRQ0;
             if (pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.bit.STALL0)
             {
-              pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.bit.STALL0;
+              pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_STALL0;
               // The Stall has occurred, then reset data toggle
               pUsb->DEVICE.DeviceEndpoint[wIndex].EPSTATUSCLR.reg = USB_DEVICE_EPSTATUSSET_DTGLOUT;
             }

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ void sam_ba_usb_CDC_Enumerate(P_USB_CDC pCdc)`
`344`	`344`	`pUsb->DEVICE.DeviceEndpoint[wIndex].EPSTATUSCLR.reg = USB_DEVICE_EPSTATUSCLR_STALLRQ1;`
`345`	`345`	`if (pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.bit.STALL1)`
`346`	`346`	`{`
`347`		`- pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.bit.STALL1;`
	`347`	`+ pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_STALL1;`
`348`	`348`	`// The Stall has occurred, then reset data toggle`
`349`	`349`	`pUsb->DEVICE.DeviceEndpoint[wIndex].EPSTATUSCLR.reg = USB_DEVICE_EPSTATUSSET_DTGLIN;`
`350`	`350`	`}`
`@@ -358,7 +358,7 @@ void sam_ba_usb_CDC_Enumerate(P_USB_CDC pCdc)`
`358`	`358`	`pUsb->DEVICE.DeviceEndpoint[wIndex].EPSTATUSCLR.reg = USB_DEVICE_EPSTATUSCLR_STALLRQ0;`
`359`	`359`	`if (pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.bit.STALL0)`
`360`	`360`	`{`
`361`		`- pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.bit.STALL0;`
	`361`	`+ pUsb->DEVICE.DeviceEndpoint[wIndex].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_STALL0;`
`362`	`362`	`// The Stall has occurred, then reset data toggle`
`363`	`363`	`pUsb->DEVICE.DeviceEndpoint[wIndex].EPSTATUSCLR.reg = USB_DEVICE_EPSTATUSSET_DTGLOUT;`
`364`	`364`	`}`