Merge pull request #24 from adamgreen/gccWarnFixMbedSDK

bogdanm · bogdanm · commit 5ae0e913b10d · 2013-08-13T03:04:42.000-07:00
Update mbed SDK sources to silence GCC warnings
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,6 @@ uVision Project/
 
 *.bak
 debug.log
+
+# Ignore OS X Desktop Services Store files
+.DS_Store
diff --git a/libraries/mbed/common/pinmap_common.c b/libraries/mbed/common/pinmap_common.c
@@ -45,7 +45,7 @@ uint32_t pinmap_merge(uint32_t a, uint32_t b) {
 }
 
 uint32_t pinmap_peripheral(PinName pin, const PinMap* map) {
-    if (pin == (uint32_t)NC)
+    if (pin == (PinName)NC)
         return (uint32_t)NC;
 
     while (map->pin != NC) {
diff --git a/libraries/mbed/common/wait_api.c b/libraries/mbed/common/wait_api.c
@@ -26,5 +26,5 @@ void wait_ms(int ms) {
 
 void wait_us(int us) {
     uint32_t start = us_ticker_read();
-    while ((us_ticker_read() - start) < us);
+    while ((us_ticker_read() - start) < (uint32_t)us);
 }
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/analogin_api.c
@@ -41,7 +41,7 @@ static const PinMap PinMap_ADC[] = {
 
 void analogin_init(analogin_t *obj, PinName pin) {
     obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);
-    if (obj->adc == (uint32_t)NC) {
+    if (obj->adc == (ADCName)NC) {
         error("ADC pin mapping failed");
     }
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/analogout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/analogout_api.c
@@ -28,7 +28,7 @@ static const PinMap PinMap_DAC[] = {
 
 void analogout_init(dac_t *obj, PinName pin) {
     obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC);
-    if (obj->dac == (uint32_t)NC) {
+    if (obj->dac == (DACName)NC) {
         error("DAC pin mapping failed");
     }
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/i2c_api.c
@@ -215,7 +215,7 @@ void i2c_frequency(i2c_t *obj, int hz) {
     for (i = 1; i < 5; i*=2) {
         for (j = 0; j < 0x40; j++) {
             ref = PCLK / (i*ICR[j]);
-            if (ref > hz)
+            if (ref > (uint32_t)hz)
                 continue;
             error = hz - ref;
             if (error < p_error) {
@@ -392,7 +392,7 @@ int i2c_slave_read(i2c_t *obj, char *data, int length) {
 }
 
 int i2c_slave_write(i2c_t *obj, const char *data, int length) {
-    uint32_t i, count = 0;
+    int i, count = 0;
     
     // set tx mode
     obj->i2c->C1 |= I2C_C1_TX_MASK;
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/pinmap.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/pinmap.c
@@ -17,7 +17,7 @@
 #include "error.h"
 
 void pin_function(PinName pin, int function) {
-    if (pin == (uint32_t)NC) return;
+    if (pin == (PinName)NC) return;
 
     uint32_t port_n = (uint32_t)pin >> PORT_SHIFT;
     uint32_t pin_n  = (uint32_t)(pin & 0x7C) >> 2;
@@ -30,7 +30,7 @@ void pin_function(PinName pin, int function) {
 }
 
 void pin_mode(PinName pin, PinMode mode) {
-    if (pin == (uint32_t)NC) { return; }
+    if (pin == (PinName)NC) { return; }
 
     __IO uint32_t* pin_pcr = (__IO uint32_t*)(PORTA_BASE + pin);
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/pwmout_api.c
@@ -48,7 +48,7 @@ static const PinMap PinMap_PWM[] = {
 void pwmout_init(pwmout_t* obj, PinName pin) {
     // determine the channel
     PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM);
-    if (pwm == (uint32_t)NC)
+    if (pwm == (PWMName)NC)
         error("PwmOut pin mapping failed");
 
     unsigned int port = (unsigned int)pin >> PORT_SHIFT;
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL25Z/spi_api.c
@@ -153,7 +153,7 @@ void spi_frequency(spi_t *obj, int hz) {
         divisor = 2;
         for (spr = 0; spr <= 8; spr++, divisor *= 2) {
             ref = PCLK / (prescaler*divisor);
-            if (ref > hz)
+            if (ref > (uint32_t)hz)
                 continue;
             error = hz - ref;
             if (error < p_error) {
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c
@@ -46,7 +46,7 @@ static const PinMap PinMap_ADC[] = {
 
 void analogin_init(analogin_t *obj, PinName pin) {
     obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);
-    if (obj->adc == (uint32_t)NC) {
+    if (obj->adc == (ADCName)NC) {
         error("ADC pin mapping failed");
     }
     
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c
@@ -20,7 +20,7 @@
 #define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60)
 
 void pin_function(PinName pin, int function) {
-    if (pin == (uint32_t)NC) return;
+    if (pin == (PinName)NC) return;
     
     uint32_t pin_number = (uint32_t)pin;
     
@@ -33,7 +33,7 @@ void pin_function(PinName pin, int function) {
 }
 
 void pin_mode(PinName pin, PinMode mode) {
-    if (pin == (uint32_t)NC) { return; }
+    if (pin == (PinName)NC) { return; }
     
     uint32_t pin_number = (uint32_t)pin;
     uint32_t drain = ((uint32_t) mode & (uint32_t) OpenDrain) >> 2;
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.c
@@ -71,7 +71,7 @@ static unsigned int pwm_clock_mhz;
 void pwmout_init(pwmout_t* obj, PinName pin) {
     // determine the channel
     PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM);
-    if (pwm == (uint32_t)NC)
+    if (pwm == (PWMName)NC)
         error("PwmOut pin mapping failed");
     
     obj->pwm = pwm;
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogin_api.c
@@ -44,7 +44,7 @@ static const PinMap PinMap_ADC[] = {
 
 void analogin_init(analogin_t *obj, PinName pin) {
     obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);
-    if (obj->adc == (uint32_t)NC) {
+    if (obj->adc == (ADCName)NC) {
         error("ADC pin mapping failed");
     }
     
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/analogout_api.c
@@ -26,7 +26,7 @@ static const PinMap PinMap_DAC[] = {
 
 void analogout_init(dac_t *obj, PinName pin) {
     obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC);
-    if (obj->dac == (uint32_t)NC) {
+    if (obj->dac == (DACName)NC) {
         error("DAC pin mapping failed");
     }
     
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c
@@ -164,7 +164,7 @@ void can_irq_set(can_t *obj, CanIrqType type, uint32_t enable) {
     obj->dev->MOD &= ~(1);
     
     // Enable NVIC if at least 1 interrupt is active
-    if(LPC_CAN1->IER | LPC_CAN2->IER != 0) {
+    if(LPC_CAN1->IER | LPC_CAN2->IER) {
         NVIC_SetVector(CAN_IRQn, (uint32_t) &can_irq_n);
         NVIC_EnableIRQ(CAN_IRQn);
     }
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/ethernet_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/ethernet_api.c
@@ -697,7 +697,7 @@ int ethernet_receive() {
     if(receive_idx == -1) {
       receive_idx = LPC_EMAC->RxConsumeIndex;
     } else {
-        while(!(rxstat[receive_idx].Info & RINFO_LAST_FLAG) && (receive_idx != LPC_EMAC->RxProduceIndex)) {
+        while(!(rxstat[receive_idx].Info & RINFO_LAST_FLAG) && ((uint32_t)receive_idx != LPC_EMAC->RxProduceIndex)) {
             receive_idx  = rinc(receive_idx, NUM_RX_FRAG);
         }
         unsigned int info =   rxstat[receive_idx].Info;
@@ -713,7 +713,7 @@ int ethernet_receive() {
         LPC_EMAC->RxConsumeIndex = receive_idx;
     }
 
-    if(receive_idx == LPC_EMAC->RxProduceIndex) {
+    if((uint32_t)receive_idx == LPC_EMAC->RxProduceIndex) {
         receive_idx = -1;
         return 0;
     }
@@ -762,7 +762,7 @@ int ethernet_read(char *data, int dlen) {
     void        *pdst, *psrc;
     int          doff = 0;
 
-    if(receive_idx == LPC_EMAC->RxProduceIndex || receive_idx == -1) {
+    if((uint32_t)receive_idx == LPC_EMAC->RxProduceIndex || receive_idx == -1) {
         return 0;
     }
 
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c
@@ -17,7 +17,7 @@
 #include "error.h"
 
 void pin_function(PinName pin, int function) {
-    if (pin == (uint32_t)NC) return;
+    if (pin == (PinName)NC) return;
     
     uint32_t pin_number = (uint32_t)pin - (uint32_t)P0_0;
     int index = pin_number >> 4;
@@ -28,7 +28,7 @@ void pin_function(PinName pin, int function) {
 }
 
 void pin_mode(PinName pin, PinMode mode) {
-    if (pin == (uint32_t)NC) { return; }
+    if (pin == (PinName)NC) { return; }
     
     uint32_t pin_number = (uint32_t)pin - (uint32_t)P0_0;
     int index = pin_number >> 5;
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/pwmout_api.c
@@ -57,7 +57,7 @@ static unsigned int pwm_clock_mhz;
 void pwmout_init(pwmout_t* obj, PinName pin) {
     // determine the channel
     PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM);
-    if (pwm == (uint32_t)NC)
+    if (pwm == (PWMName)NC)
         error("PwmOut pin mapping failed");
     
     obj->pwm = pwm;

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ uint32_t pinmap_merge(uint32_t a, uint32_t b) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`uint32_t pinmap_peripheral(PinName pin, const PinMap* map) {`
`48`		`- if (pin == (uint32_t)NC)`
	`48`	`+ if (pin == (PinName)NC)`
`49`	`49`	`return (uint32_t)NC;`
`50`	`50`
`51`	`51`	`while (map->pin != NC) {`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,5 @@ void wait_ms(int ms) {`
`26`	`26`
`27`	`27`	`void wait_us(int us) {`
`28`	`28`	`uint32_t start = us_ticker_read();`
`29`		`- while ((us_ticker_read() - start) < us);`
	`29`	`+ while ((us_ticker_read() - start) < (uint32_t)us);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static const PinMap PinMap_ADC[] = {`
`41`	`41`
`42`	`42`	`void analogin_init(analogin_t *obj, PinName pin) {`
`43`	`43`	`obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);`
`44`		`- if (obj->adc == (uint32_t)NC) {`
	`44`	`+ if (obj->adc == (ADCName)NC) {`
`45`	`45`	`error("ADC pin mapping failed");`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ static const PinMap PinMap_DAC[] = {`
`28`	`28`
`29`	`29`	`void analogout_init(dac_t *obj, PinName pin) {`
`30`	`30`	`obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC);`
`31`		`- if (obj->dac == (uint32_t)NC) {`
	`31`	`+ if (obj->dac == (DACName)NC) {`
`32`	`32`	`error("DAC pin mapping failed");`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ static const PinMap PinMap_ADC[] = {`
`46`	`46`
`47`	`47`	`void analogin_init(analogin_t *obj, PinName pin) {`
`48`	`48`	`obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);`
`49`		`- if (obj->adc == (uint32_t)NC) {`
	`49`	`+ if (obj->adc == (ADCName)NC) {`
`50`	`50`	`error("ADC pin mapping failed");`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ static const PinMap PinMap_ADC[] = {`
`44`	`44`
`45`	`45`	`void analogin_init(analogin_t *obj, PinName pin) {`
`46`	`46`	`obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);`
`47`		`- if (obj->adc == (uint32_t)NC) {`
	`47`	`+ if (obj->adc == (ADCName)NC) {`
`48`	`48`	`error("ADC pin mapping failed");`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ static const PinMap PinMap_DAC[] = {`
`26`	`26`
`27`	`27`	`void analogout_init(dac_t *obj, PinName pin) {`
`28`	`28`	`obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC);`
`29`		`- if (obj->dac == (uint32_t)NC) {`
	`29`	`+ if (obj->dac == (DACName)NC) {`
`30`	`30`	`error("DAC pin mapping failed");`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ void can_irq_set(can_t *obj, CanIrqType type, uint32_t enable) {`
`164`	`164`	`obj->dev->MOD &= ~(1);`
`165`	`165`
`166`	`166`	`// Enable NVIC if at least 1 interrupt is active`
`167`		`- if(LPC_CAN1->IER \| LPC_CAN2->IER != 0) {`
	`167`	`+ if(LPC_CAN1->IER \| LPC_CAN2->IER) {`
`168`	`168`	`NVIC_SetVector(CAN_IRQn, (uint32_t) &can_irq_n);`
`169`	`169`	`NVIC_EnableIRQ(CAN_IRQn);`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ int ethernet_receive() {`
`697`	`697`	`if(receive_idx == -1) {`
`698`	`698`	`receive_idx = LPC_EMAC->RxConsumeIndex;`
`699`	`699`	`} else {`
`700`		`- while(!(rxstat[receive_idx].Info & RINFO_LAST_FLAG) && (receive_idx != LPC_EMAC->RxProduceIndex)) {`
	`700`	`+ while(!(rxstat[receive_idx].Info & RINFO_LAST_FLAG) && ((uint32_t)receive_idx != LPC_EMAC->RxProduceIndex)) {`
`701`	`701`	`receive_idx = rinc(receive_idx, NUM_RX_FRAG);`
`702`	`702`	`}`
`703`	`703`	`unsigned int info = rxstat[receive_idx].Info;`
`@@ -713,7 +713,7 @@ int ethernet_receive() {`
`713`	`713`	`LPC_EMAC->RxConsumeIndex = receive_idx;`
`714`	`714`	`}`
`715`	`715`
`716`		`- if(receive_idx == LPC_EMAC->RxProduceIndex) {`
	`716`	`+ if((uint32_t)receive_idx == LPC_EMAC->RxProduceIndex) {`
`717`	`717`	`receive_idx = -1;`
`718`	`718`	`return 0;`
`719`	`719`	`}`
`@@ -762,7 +762,7 @@ int ethernet_read(char *data, int dlen) {`
`762`	`762`	`void pdst, psrc;`
`763`	`763`	`int doff = 0;`
`764`	`764`
`765`		`- if(receive_idx == LPC_EMAC->RxProduceIndex \|\| receive_idx == -1) {`
	`765`	`+ if((uint32_t)receive_idx == LPC_EMAC->RxProduceIndex \|\| receive_idx == -1) {`
`766`	`766`	`return 0;`
`767`	`767`	`}`
`768`	`768`