fix pwm hal implemenation for nRF51.

nvlsianpu · nvlsianpu · commit 4fcffd40b15c · 2016-06-16T17:23:35.000+01:00
PwmOut::pwm renamed to PwmOut::pwm_name
diff --git a/hal/targets.json b/hal/targets.json
@@ -1388,7 +1388,7 @@
         "supported_form_factors": ["ARDUINO"],
         "inherits": ["MCU_NRF51_32K"],
         "progen": {"target": "nrf51-dk"},
-        "device_has": ["ERROR_PATTERN", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "SERIAL", "RTC", "SERIAL_ASYNCH", "SLEEP"]
+        "device_has": ["ERROR_PATTERN", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "RTC", "SERIAL_ASYNCH", "SLEEP"]
     },
     "NRF51_DK_BOOT": {
         "supported_form_factors": ["ARDUINO"],
diff --git a/hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/pwmout_api.c b/hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/pwmout_api.c
@@ -138,7 +138,7 @@ void pwmout_init(pwmout_t *obj, PinName pin)
 
 void pwmout_free(pwmout_t *obj)
 {
-    MBED_ASSERT(obj->pwm != (PWMName)NC);
+    MBED_ASSERT(obj->pwm_name != (PWMName)NC);
     MBED_ASSERT(obj->pwm_channel < PWM_CHANNELS_PER_INSTANCE);
 
     pwm_t * pwm = (pwm_t *) obj->pwm_struct;

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ void pwmout_init(pwmout_t *obj, PinName pin)`
`138`	`138`
`139`	`139`	`void pwmout_free(pwmout_t *obj)`
`140`	`140`	`{`
`141`		`- MBED_ASSERT(obj->pwm != (PWMName)NC);`
	`141`	`+ MBED_ASSERT(obj->pwm_name != (PWMName)NC);`
`142`	`142`	`MBED_ASSERT(obj->pwm_channel < PWM_CHANNELS_PER_INSTANCE);`
`143`	`143`
`144`	`144`	`pwm_t * pwm = (pwm_t *) obj->pwm_struct;`