pwmout - fixed compile errors

talorion · talorion · commit b03d80fd0800 · 2020-09-02T13:39:17.000+02:00
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/pwmout_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/pwmout_api.c
@@ -134,6 +134,7 @@ int pwmout_read_period_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = ((base->MOD) + 1) / pwm_clock_mhz;
     }
     return tmp;
@@ -164,6 +165,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
     }
     return tmp;
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/pwmout_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/pwmout_api.c
@@ -134,6 +134,7 @@ int pwmout_read_period_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = ((base->MOD) + 1) / pwm_clock_mhz;
     }
     return tmp;
@@ -164,6 +165,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
     }
     return tmp;
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/pwmout_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/pwmout_api.c
@@ -131,6 +131,7 @@ int pwmout_read_period_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = ((base->MOD) + 1) / pwm_clock_mhz;
     }
     return tmp;
@@ -159,6 +160,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
     }
     return tmp;
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/pwmout_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/pwmout_api.c
@@ -131,6 +131,7 @@ int pwmout_read_period_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = ((base->MOD) + 1) / pwm_clock_mhz;
     }
     return tmp;
@@ -159,6 +160,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
     }
     return tmp;
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/pwmout_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/pwmout_api.c
@@ -131,6 +131,7 @@ int pwmout_read_period_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = ((base->MOD) + 1) / pwm_clock_mhz;
     }
     return tmp;
@@ -159,6 +160,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
     }
     return tmp;
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/pwmout_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/pwmout_api.c
@@ -134,6 +134,7 @@ int pwmout_read_period_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];;
         tmp = ((base->MOD) + 1) / pwm_clock_mhz;
     }
     return tmp;
@@ -164,6 +165,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
     }
     return tmp;
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/pwmout_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/pwmout_api.c
@@ -162,6 +162,7 @@ int pwmout_read_period_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
         uint16_t mod = base->MOD & FTM_MOD_MOD_MASK;
         tmp = ((mod) + 1) / pwm_clock_mhz;
     }
@@ -193,6 +194,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
 {
     uint32_t tmp = 0;
     if (pwm_clock_mhz > 0) {
+        FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
         tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
     }
     return tmp;
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/pwmout_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/pwmout_api.c
@@ -353,7 +353,7 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int pulse)
     nordic_pwm_restart(obj);
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj) {
     return (obj->period) * (obj->percent);
 }
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M2351/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_M2351/pwmout_api.c
@@ -194,7 +194,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     pwmout_config(obj, 1);
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj)
+{
     return obj->pulsewidth_us;
 }
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M251/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_M251/pwmout_api.c
@@ -180,7 +180,7 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     pwmout_config(obj, 1);
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj) {
     return obj->pulsewidth_us;
 }
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M261/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_M261/pwmout_api.c
@@ -179,7 +179,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     pwmout_config(obj, 1);
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj)
+{
     return obj->pulsewidth_us;
 }
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_M451/pwmout_api.c
@@ -184,7 +184,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     pwmout_config(obj);
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj)
+{
     return obj->pulsewidth_us;
 }
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M480/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_M480/pwmout_api.c
@@ -182,7 +182,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     pwmout_config(obj, 1);
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj)
+{
     return obj->pulsewidth_us;
 }
 
diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_NANO100/pwmout_api.c
@@ -187,7 +187,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     pwmout_config(obj);
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj)
+{
     return obj->pulsewidth_us;
 }
 
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/pwmout_api.c b/targets/TARGET_NUVOTON/TARGET_NUC472/pwmout_api.c
@@ -208,7 +208,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     pwmout_config(obj);
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj)
+{
     return obj->pulsewidth_us;
 }
 
diff --git a/targets/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c b/targets/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c
@@ -236,7 +236,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     }
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj)
+{
     return (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0;
 }
 
diff --git a/targets/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c b/targets/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c
@@ -174,6 +174,8 @@ void pwmout_period_us(pwmout_t *obj, int us)
 
 int pwmout_read_period_us(pwmout_t *obj)
 {
+    timer_mr tid = pwm_timer_map[obj->pwm];
+    LPC_TMR_TypeDef *timer = Timers[tid.timer];
     return (timer->MR3);
 }
 
@@ -202,7 +204,10 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     timer->TCR = TCR_CNT_EN;
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj)
+{
+    timer_mr tid = pwm_timer_map[obj->pwm];
+    LPC_TMR_TypeDef *timer = Timers[tid.timer];
     return (timer->MR3 - timer->MR[tid.mr]);
 }
 
diff --git a/targets/TARGET_NXP/TARGET_LPC176X/pwmout_api.c b/targets/TARGET_NXP/TARGET_LPC176X/pwmout_api.c
@@ -155,7 +155,7 @@ void pwmout_period_us(pwmout_t *obj, int us)
 
 int pwmout_read_period_us(pwmout_t *obj)
 {
-    return (float)(LPC_PWM1->MR0);
+    return (LPC_PWM1->MR0);
 }
 
 void pwmout_pulsewidth(pwmout_t *obj, float seconds)
@@ -185,8 +185,9 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     LPC_PWM1->LER |= 1 << obj->pwm;
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
-    return (timer->MR3 - timer->MR[tid.mr]);
+int pwmout_read_pulsewidth_us(pwmout_t *obj)
+{
+    return (*obj->MR);
 }
 
 const PinMap *pwmout_pinmap()
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_IMX/pwmout_api.c b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_IMX/pwmout_api.c
@@ -196,6 +196,8 @@ void pwmout_period_us(pwmout_t *obj, int us)
 
 int pwmout_read_period_us(pwmout_t *obj)
 {
+    PWM_Type *base = pwm_addrs[(obj->pwm_name >> PWM_SHIFT) & 0x7];
+    uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3;
     return (base->SM[module].VAL1) & PWM_VAL1_VAL1_MASK;
 }
 
@@ -228,9 +230,11 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     PWM_SetPwmLdok(base, (1 << module), true);
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj) {
     uint16_t count;
-
+    PWM_Type *base = pwm_addrs[(obj->pwm_name >> PWM_SHIFT) & 0x7];
+    uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3;
+    uint32_t pwmchannel = obj->pwm_name & 0x1;
     if (pwmchannel == 0)
     {
         count = (base->SM[module].VAL3) & PWM_VAL3_VAL3_MASK;
diff --git a/targets/TARGET_RENESAS/TARGET_RZ_A1XX/pwmout_api.c b/targets/TARGET_RENESAS/TARGET_RZ_A1XX/pwmout_api.c
@@ -567,11 +567,11 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
     pwmout_write(obj, value);
 }
 
-int pwmout_read_pulsewidth_us(pwmout_t *obj {
+int pwmout_read_pulsewidth_us(pwmout_t *obj)
+{
     uint32_t wk_pulse = 0;
 
-    if (obj->pwm >= MTU2_PWM_OFFSET)
-    {
+    if (obj->pwm >= MTU2_PWM_OFFSET) {
 #ifdef FUMC_MTU2_PWM
         /* PWM by MTU2 */
 

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ int pwmout_read_period_us(pwmout_t *obj)`
`134`	`134`	`{`
`135`	`135`	`uint32_t tmp = 0;`
`136`	`136`	`if (pwm_clock_mhz > 0) {`
	`137`	`+ FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];`
`137`	`138`	`tmp = ((base->MOD) + 1) / pwm_clock_mhz;`
`138`	`139`	`}`
`139`	`140`	`return tmp;`
`@@ -164,6 +165,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)`
`164`	`165`	`{`
`165`	`166`	`uint32_t tmp = 0;`
`166`	`167`	`if (pwm_clock_mhz > 0) {`
	`168`	`+ FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];`
`167`	`169`	`tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;`
`168`	`170`	`}`
`169`	`171`	`return tmp;`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ int pwmout_read_period_us(pwmout_t *obj)`
`131`	`131`	`{`
`132`	`132`	`uint32_t tmp = 0;`
`133`	`133`	`if (pwm_clock_mhz > 0) {`
	`134`	`+ TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];`
`134`	`135`	`tmp = ((base->MOD) + 1) / pwm_clock_mhz;`
`135`	`136`	`}`
`136`	`137`	`return tmp;`
`@@ -159,6 +160,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)`
`159`	`160`	`{`
`160`	`161`	`uint32_t tmp = 0;`
`161`	`162`	`if (pwm_clock_mhz > 0) {`
	`163`	`+ TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];`
`162`	`164`	`tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;`
`163`	`165`	`}`
`164`	`166`	`return tmp;`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,7 @@ int pwmout_read_period_us(pwmout_t *obj)`
`162`	`162`	`{`
`163`	`163`	`uint32_t tmp = 0;`
`164`	`164`	`if (pwm_clock_mhz > 0) {`
	`165`	`+ FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];`
`165`	`166`	`uint16_t mod = base->MOD & FTM_MOD_MOD_MASK;`
`166`	`167`	`tmp = ((mod) + 1) / pwm_clock_mhz;`
`167`	`168`	`}`
`@@ -193,6 +194,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)`
`193`	`194`	`{`
`194`	`195`	`uint32_t tmp = 0;`
`195`	`196`	`if (pwm_clock_mhz > 0) {`
	`197`	`+ FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];`
`196`	`198`	`tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;`
`197`	`199`	`}`
`198`	`200`	`return tmp;`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int pulse)`
`353`	`353`	`nordic_pwm_restart(obj);`
`354`	`354`	`}`
`355`	`355`
`356`		`-int pwmout_read_pulsewidth_us(pwmout_t *obj {`
	`356`	`+int pwmout_read_pulsewidth_us(pwmout_t *obj) {`
`357`	`357`	`return (obj->period) * (obj->percent);`
`358`	`358`	`}`
`359`	`359`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)`
`194`	`194`	`pwmout_config(obj, 1);`
`195`	`195`	`}`
`196`	`196`
`197`		`-int pwmout_read_pulsewidth_us(pwmout_t *obj {`
	`197`	`+int pwmout_read_pulsewidth_us(pwmout_t *obj)`
	`198`	`+{`
`198`	`199`	`return obj->pulsewidth_us;`
`199`	`200`	`}`
`200`	`201`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)`
`180`	`180`	`pwmout_config(obj, 1);`
`181`	`181`	`}`
`182`	`182`
`183`		`-int pwmout_read_pulsewidth_us(pwmout_t *obj {`
	`183`	`+int pwmout_read_pulsewidth_us(pwmout_t *obj) {`
`184`	`184`	`return obj->pulsewidth_us;`
`185`	`185`	`}`
`186`	`186`