Merge pull request #2063 from abakosh/develop

hathach · web-flow · commit eedafb23f727 · 2023-05-24T20:11:50.000+07:00
fix(RA Host Portable): implement missing function __builtin_ctz(x)
diff --git a/src/portable/renesas/rusb2/hcd_rusb2.c b/src/portable/renesas/rusb2/hcd_rusb2.c
@@ -407,7 +407,7 @@ static void process_pipe0_bemp(uint8_t rhport)
 static void process_pipe_nrdy(uint8_t rhport, unsigned num)
 {
   (void)rhport;
-  unsigned result;
+  xfer_result_t result;
   uint16_t volatile *ctr = get_pipectr(num);
   // TU_LOG1("NRDY %d %x\n", num, *ctr);
   switch (*ctr & RUSB2_PIPE_CTR_PID_Msk) {
diff --git a/src/portable/renesas/rusb2/rusb2_ra.h b/src/portable/renesas/rusb2/rusb2_ra.h
@@ -36,6 +36,10 @@ extern "C" {
 
 #define RUSB2_REG_BASE (0x40090000)
 
+#if defined(__ICCARM__)
+  #define __builtin_ctz(x)             __iar_builtin_CLZ(__iar_builtin_RBIT(x))
+#endif
+
 TU_ATTR_ALWAYS_INLINE static inline void rusb2_int_enable(uint8_t rhport)
 {
   (void) rhport;

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ static void process_pipe0_bemp(uint8_t rhport)`
`407`	`407`	`static void process_pipe_nrdy(uint8_t rhport, unsigned num)`
`408`	`408`	`{`
`409`	`409`	`(void)rhport;`
`410`		`- unsigned result;`
	`410`	`+ xfer_result_t result;`
`411`	`411`	`uint16_t volatile *ctr = get_pipectr(num);`
`412`	`412`	`// TU_LOG1("NRDY %d %x\n", num, *ctr);`
`413`	`413`	`switch (*ctr & RUSB2_PIPE_CTR_PID_Msk) {`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,10 @@ extern "C" {`
`36`	`36`
`37`	`37`	`#define RUSB2_REG_BASE (0x40090000)`
`38`	`38`
	`39`	`+#if defined(__ICCARM__)`
	`40`	`+ #define __builtin_ctz(x) __iar_builtin_CLZ(__iar_builtin_RBIT(x))`
	`41`	`+#endif`
	`42`	`+`
`39`	`43`	`TU_ATTR_ALWAYS_INLINE static inline void rusb2_int_enable(uint8_t rhport)`
`40`	`44`	`{`
`41`	`45`	`(void) rhport;`