Merge pull request #137 from dmitrystu/work/133-fix-pedantic

dmitrystu · web-flow · commit 8f59e4a2af72 · 2024-05-19T23:49:24.000+03:00
#133 fix possible pedantic errors
diff --git a/src/usbd_stm32f103_devfs.c b/src/usbd_stm32f103_devfs.c
@@ -345,7 +345,7 @@ static void ep_deconfig(uint8_t ep) {
 }
 
 static uint16_t pma_read (uint8_t *buf, uint16_t blen, pma_rec *rx) {
-    uint16_t tmp;
+    uint16_t tmp = 0;
     uint16_t *pma = PMA(rx->addr);
     uint16_t rxcnt = rx->cnt & 0x03FF;
     rx->cnt &= ~0x3FF;
diff --git a/src/usbd_stm32f105_otgfs.c b/src/usbd_stm32f105_otgfs.c
@@ -321,7 +321,7 @@ static void ep_deconfig(uint8_t ep) {
 }
 
 static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {
-    uint32_t len, tmp;
+    uint32_t len, tmp = 0;
     volatile uint32_t *fifo = EPFIFO(0);
     /* no data in RX FIFO */
     if (!(OTG->GINTSTS & USB_OTG_GINTSTS_RXFLVL)) return -1;
@@ -416,6 +416,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {
             case 0x03:  /* OUT completed */
             case 0x04:  /* SETUP completed */
                 _BST(EPOUT(ep)->DOEPCTL, USB_OTG_DOEPCTL_CNAK | USB_OTG_DOEPCTL_EPENA);
+                // fall through
             default:
                 /* pop GRXSTSP */
                 OTG->GRXSTSP;
@@ -436,7 +437,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {
             /* no more supported events */
             return;
         }
-        return callback(dev, evt, ep);
+        callback(dev, evt, ep);
     }
 }
 
diff --git a/src/usbd_stm32f429_otgfs.c b/src/usbd_stm32f429_otgfs.c
@@ -318,7 +318,7 @@ static void ep_deconfig(uint8_t ep) {
 }
 
 static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {
-    uint32_t len, tmp;
+    uint32_t len, tmp = 0;
     volatile uint32_t *fifo = EPFIFO(0);
     /* no data in RX FIFO */
     if (!(OTG->GINTSTS & USB_OTG_GINTSTS_RXFLVL)) return -1;
@@ -413,6 +413,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {
             case 0x03:  /* OUT completed */
             case 0x04:  /* SETUP completed */
                 _BST(EPOUT(ep)->DOEPCTL, USB_OTG_DOEPCTL_CNAK | USB_OTG_DOEPCTL_EPENA);
+                // fall through
             default:
                 /* pop GRXSTSP */
                 OTG->GRXSTSP;
@@ -433,7 +434,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {
             /* no more supported events */
             return;
         }
-        return callback(dev, evt, ep);
+        callback(dev, evt, ep);
     }
 }
 
diff --git a/src/usbd_stm32f429_otghs.c b/src/usbd_stm32f429_otghs.c
@@ -320,7 +320,7 @@ static void ep_deconfig(uint8_t ep) {
 }
 
 static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {
-    uint32_t len, tmp;
+    uint32_t len, tmp = 0;
     volatile uint32_t *fifo = EPFIFO(0);
     /* no data in RX FIFO */
     if (!(OTG->GINTSTS & USB_OTG_GINTSTS_RXFLVL)) return -1;
@@ -418,6 +418,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {
             case 0x03:  /* OUT completed */
             case 0x04:  /* SETUP completed */
                 _BST(EPOUT(ep)->DOEPCTL, USB_OTG_DOEPCTL_CNAK | USB_OTG_DOEPCTL_EPENA);
+                // fall through
             default:
                 /* pop GRXSTSP */
                 OTG->GRXSTSP;
@@ -438,7 +439,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {
             /* no more supported events */
             return;
         }
-        return callback(dev, evt, ep);
+        callback(dev, evt, ep);
     }
 }
 
diff --git a/src/usbd_stm32f446_otgfs.c b/src/usbd_stm32f446_otgfs.c
@@ -309,7 +309,7 @@ static void ep_deconfig(uint8_t ep) {
 }
 
 static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {
-    uint32_t len, tmp;
+    uint32_t len, tmp = 0;
     ep &= 0x7F;
     volatile uint32_t *fifo = EPFIFO(0);
     USB_OTG_OUTEndpointTypeDef* epo = EPOUT(ep);
@@ -418,7 +418,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {
             /* no more supported events */
             return;
         }
-        return callback(dev, evt, ep);
+        callback(dev, evt, ep);
     }
 }
 
diff --git a/src/usbd_stm32f446_otghs.c b/src/usbd_stm32f446_otghs.c
@@ -309,7 +309,7 @@ static void ep_deconfig(uint8_t ep) {
 }
 
 static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {
-    uint32_t len, tmp;
+    uint32_t len, tmp = 0;
     ep &= 0x7F;
     volatile uint32_t *fifo = EPFIFO(0);
     USB_OTG_OUTEndpointTypeDef* epo = EPOUT(ep);
@@ -418,7 +418,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {
             /* no more supported events */
             return;
         }
-        return callback(dev, evt, ep);
+        callback(dev, evt, ep);
     }
 }
 
diff --git a/src/usbd_stm32h743_otgfs.c b/src/usbd_stm32h743_otgfs.c
@@ -309,7 +309,7 @@ static void ep_deconfig(uint8_t ep) {
 }
 
 static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {
-    uint32_t len, tmp;
+    uint32_t len, tmp = 0;
     ep &= 0x7F;
     volatile uint32_t *fifo = EPFIFO(0);
     USB_OTG_OUTEndpointTypeDef* epo = EPOUT(ep);
@@ -418,7 +418,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {
             /* no more supported events */
             return;
         }
-        return callback(dev, evt, ep);
+        callback(dev, evt, ep);
     }
 }
 
diff --git a/src/usbd_stm32l052_devfs.c b/src/usbd_stm32l052_devfs.c
@@ -283,7 +283,7 @@ static void ep_deconfig(uint8_t ep) {
 }
 
 static uint16_t pma_read (uint8_t *buf, uint16_t blen, pma_rec *rx) {
-    uint16_t tmp;
+    uint16_t tmp = 0;
     uint16_t *pma = (void*)(USB_PMAADDR + rx->addr);
     uint16_t rxcnt = rx->cnt & 0x03FF;
     rx->cnt &= ~0x3FF;
diff --git a/src/usbd_stm32l100_devfs.c b/src/usbd_stm32l100_devfs.c
@@ -255,7 +255,7 @@ static void ep_deconfig(uint8_t ep) {
 }
 
 static uint16_t pma_read (uint8_t *buf, uint16_t blen, pma_rec *rx) {
-    uint16_t tmp;
+    uint16_t tmp = 0;
     uint16_t *pma = (void*)(USB_PMAADDR + 2 * rx->addr);
     uint16_t rxcnt = rx->cnt & 0x03FF;
     rx->cnt &= ~0x3FF;
diff --git a/src/usbd_stm32l476_otgfs.c b/src/usbd_stm32l476_otgfs.c
@@ -342,7 +342,7 @@ static void ep_deconfig(uint8_t ep) {
 }
 
 static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {
-    uint32_t len, tmp;
+    uint32_t len, tmp = 0;
     ep &= 0x7F;
     volatile uint32_t *fifo = EPFIFO(0);
     USB_OTG_OUTEndpointTypeDef* epo = EPOUT(ep);
@@ -451,7 +451,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {
             /* no more supported events */
             return;
         }
-        return callback(dev, evt, ep);
+        callback(dev, evt, ep);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ static void ep_deconfig(uint8_t ep) {`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`static uint16_t pma_read (uint8_t buf, uint16_t blen, pma_rec rx) {`
`348`		`- uint16_t tmp;`
	`348`	`+ uint16_t tmp = 0;`
`349`	`349`	`uint16_t *pma = PMA(rx->addr);`
`350`	`350`	`uint16_t rxcnt = rx->cnt & 0x03FF;`
`351`	`351`	`rx->cnt &= ~0x3FF;`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ static void ep_deconfig(uint8_t ep) {`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {`
`324`		`- uint32_t len, tmp;`
	`324`	`+ uint32_t len, tmp = 0;`
`325`	`325`	`volatile uint32_t *fifo = EPFIFO(0);`
`326`	`326`	`/* no data in RX FIFO */`
`327`	`327`	`if (!(OTG->GINTSTS & USB_OTG_GINTSTS_RXFLVL)) return -1;`
`@@ -416,6 +416,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {`
`416`	`416`	`case 0x03: /* OUT completed */`
`417`	`417`	`case 0x04: /* SETUP completed */`
`418`	`418`	`_BST(EPOUT(ep)->DOEPCTL, USB_OTG_DOEPCTL_CNAK \| USB_OTG_DOEPCTL_EPENA);`
	`419`	`+ // fall through`
`419`	`420`	`default:`
`420`	`421`	`/* pop GRXSTSP */`
`421`	`422`	`OTG->GRXSTSP;`
`@@ -436,7 +437,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {`
`436`	`437`	`/* no more supported events */`
`437`	`438`	`return;`
`438`	`439`	`}`
`439`		`- return callback(dev, evt, ep);`
	`440`	`+ callback(dev, evt, ep);`
`440`	`441`	`}`
`441`	`442`	`}`
`442`	`443`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ static void ep_deconfig(uint8_t ep) {`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {`
`321`		`- uint32_t len, tmp;`
	`321`	`+ uint32_t len, tmp = 0;`
`322`	`322`	`volatile uint32_t *fifo = EPFIFO(0);`
`323`	`323`	`/* no data in RX FIFO */`
`324`	`324`	`if (!(OTG->GINTSTS & USB_OTG_GINTSTS_RXFLVL)) return -1;`
`@@ -413,6 +413,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {`
`413`	`413`	`case 0x03: /* OUT completed */`
`414`	`414`	`case 0x04: /* SETUP completed */`
`415`	`415`	`_BST(EPOUT(ep)->DOEPCTL, USB_OTG_DOEPCTL_CNAK \| USB_OTG_DOEPCTL_EPENA);`
	`416`	`+ // fall through`
`416`	`417`	`default:`
`417`	`418`	`/* pop GRXSTSP */`
`418`	`419`	`OTG->GRXSTSP;`
`@@ -433,7 +434,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {`
`433`	`434`	`/* no more supported events */`
`434`	`435`	`return;`
`435`	`436`	`}`
`436`		`- return callback(dev, evt, ep);`
	`437`	`+ callback(dev, evt, ep);`
`437`	`438`	`}`
`438`	`439`	`}`
`439`	`440`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ static void ep_deconfig(uint8_t ep) {`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {`
`323`		`- uint32_t len, tmp;`
	`323`	`+ uint32_t len, tmp = 0;`
`324`	`324`	`volatile uint32_t *fifo = EPFIFO(0);`
`325`	`325`	`/* no data in RX FIFO */`
`326`	`326`	`if (!(OTG->GINTSTS & USB_OTG_GINTSTS_RXFLVL)) return -1;`
`@@ -418,6 +418,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {`
`418`	`418`	`case 0x03: /* OUT completed */`
`419`	`419`	`case 0x04: /* SETUP completed */`
`420`	`420`	`_BST(EPOUT(ep)->DOEPCTL, USB_OTG_DOEPCTL_CNAK \| USB_OTG_DOEPCTL_EPENA);`
	`421`	`+ // fall through`
`421`	`422`	`default:`
`422`	`423`	`/* pop GRXSTSP */`
`423`	`424`	`OTG->GRXSTSP;`
`@@ -438,7 +439,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {`
`438`	`439`	`/* no more supported events */`
`439`	`440`	`return;`
`440`	`441`	`}`
`441`		`- return callback(dev, evt, ep);`
	`442`	`+ callback(dev, evt, ep);`
`442`	`443`	`}`
`443`	`444`	`}`
`444`	`445`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ static void ep_deconfig(uint8_t ep) {`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {`
`312`		`- uint32_t len, tmp;`
	`312`	`+ uint32_t len, tmp = 0;`
`313`	`313`	`ep &= 0x7F;`
`314`	`314`	`volatile uint32_t *fifo = EPFIFO(0);`
`315`	`315`	`USB_OTG_OUTEndpointTypeDef* epo = EPOUT(ep);`
`@@ -418,7 +418,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {`
`418`	`418`	`/* no more supported events */`
`419`	`419`	`return;`
`420`	`420`	`}`
`421`		`- return callback(dev, evt, ep);`
	`421`	`+ callback(dev, evt, ep);`
`422`	`422`	`}`
`423`	`423`	`}`
`424`	`424`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ static void ep_deconfig(uint8_t ep) {`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`static uint16_t pma_read (uint8_t buf, uint16_t blen, pma_rec rx) {`
`286`		`- uint16_t tmp;`
	`286`	`+ uint16_t tmp = 0;`
`287`	`287`	`uint16_t pma = (void)(USB_PMAADDR + rx->addr);`
`288`	`288`	`uint16_t rxcnt = rx->cnt & 0x03FF;`
`289`	`289`	`rx->cnt &= ~0x3FF;`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ static void ep_deconfig(uint8_t ep) {`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`static uint16_t pma_read (uint8_t buf, uint16_t blen, pma_rec rx) {`
`258`		`- uint16_t tmp;`
	`258`	`+ uint16_t tmp = 0;`
`259`	`259`	`uint16_t pma = (void)(USB_PMAADDR + 2 * rx->addr);`
`260`	`260`	`uint16_t rxcnt = rx->cnt & 0x03FF;`
`261`	`261`	`rx->cnt &= ~0x3FF;`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ static void ep_deconfig(uint8_t ep) {`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`static int32_t ep_read(uint8_t ep, void* buf, uint16_t blen) {`
`345`		`- uint32_t len, tmp;`
	`345`	`+ uint32_t len, tmp = 0;`
`346`	`346`	`ep &= 0x7F;`
`347`	`347`	`volatile uint32_t *fifo = EPFIFO(0);`
`348`	`348`	`USB_OTG_OUTEndpointTypeDef* epo = EPOUT(ep);`
`@@ -451,7 +451,7 @@ static void evt_poll(usbd_device *dev, usbd_evt_callback callback) {`
`451`	`451`	`/* no more supported events */`
`452`	`452`	`return;`
`453`	`453`	`}`
`454`		`- return callback(dev, evt, ep);`
	`454`	`+ callback(dev, evt, ep);`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`