STM32: fix linker error with adc_read()

bcostm · bcostm · commit 1d3eb508bf28 · 2017-11-17T13:50:59.000+01:00
diff --git a/targets/TARGET_STM/TARGET_STM32F0/analogin_device.c b/targets/TARGET_STM/TARGET_STM32F0/analogin_device.c
@@ -95,7 +95,7 @@ void analogin_init(analogin_t *obj, PinName pin)
     }
 }
 
-static inline uint16_t adc_read(analogin_t *obj)
+uint16_t adc_read(analogin_t *obj)
 {
     ADC_ChannelConfTypeDef sConfig = {0};
 
diff --git a/targets/TARGET_STM/TARGET_STM32F1/analogin_device.c b/targets/TARGET_STM/TARGET_STM32F1/analogin_device.c
@@ -101,7 +101,7 @@ void analogin_init(analogin_t *obj, PinName pin)
     }
 }
 
-static inline uint16_t adc_read(analogin_t *obj)
+uint16_t adc_read(analogin_t *obj)
 {
     ADC_ChannelConfTypeDef sConfig = {0};
 
diff --git a/targets/TARGET_STM/TARGET_STM32F2/analogin_device.c b/targets/TARGET_STM/TARGET_STM32F2/analogin_device.c
@@ -101,7 +101,7 @@ void analogin_init(analogin_t *obj, PinName pin)
     }
 }
 
-static inline uint16_t adc_read(analogin_t *obj)
+uint16_t adc_read(analogin_t *obj)
 {
     ADC_ChannelConfTypeDef sConfig = {0};
 
diff --git a/targets/TARGET_STM/TARGET_STM32F3/analogin_device.c b/targets/TARGET_STM/TARGET_STM32F3/analogin_device.c
@@ -115,7 +115,7 @@ void analogin_init(analogin_t *obj, PinName pin)
     }
 }
 
-static inline uint16_t adc_read(analogin_t *obj)
+uint16_t adc_read(analogin_t *obj)
 {
     ADC_ChannelConfTypeDef sConfig = {0};
 
diff --git a/targets/TARGET_STM/TARGET_STM32F4/analogin_device.c b/targets/TARGET_STM/TARGET_STM32F4/analogin_device.c
@@ -101,7 +101,7 @@ void analogin_init(analogin_t *obj, PinName pin)
     }
 }
 
-static inline uint16_t adc_read(analogin_t *obj)
+uint16_t adc_read(analogin_t *obj)
 {
     ADC_ChannelConfTypeDef sConfig = {0};
 
diff --git a/targets/TARGET_STM/TARGET_STM32F7/analogin_device.c b/targets/TARGET_STM/TARGET_STM32F7/analogin_device.c
@@ -101,7 +101,7 @@ void analogin_init(analogin_t *obj, PinName pin)
     }
 }
 
-static inline uint16_t adc_read(analogin_t *obj)
+uint16_t adc_read(analogin_t *obj)
 {
     ADC_ChannelConfTypeDef sConfig = {0};
 
diff --git a/targets/TARGET_STM/TARGET_STM32L0/analogin_device.c b/targets/TARGET_STM/TARGET_STM32L0/analogin_device.c
@@ -100,7 +100,7 @@ void analogin_init(analogin_t *obj, PinName pin)
     __HAL_ADC_ENABLE(&obj->handle);
 }
 
-static inline uint16_t adc_read(analogin_t *obj)
+uint16_t adc_read(analogin_t *obj)
 {
     ADC_ChannelConfTypeDef sConfig = {0};
 
diff --git a/targets/TARGET_STM/TARGET_STM32L1/analogin_device.c b/targets/TARGET_STM/TARGET_STM32L1/analogin_device.c
@@ -103,7 +103,7 @@ void analogin_init(analogin_t *obj, PinName pin)
     }
 }
 
-static inline uint16_t adc_read(analogin_t *obj)
+uint16_t adc_read(analogin_t *obj)
 {
     ADC_ChannelConfTypeDef sConfig = {0};
 
diff --git a/targets/TARGET_STM/TARGET_STM32L4/analogin_device.c b/targets/TARGET_STM/TARGET_STM32L4/analogin_device.c
@@ -99,7 +99,7 @@ void analogin_init(analogin_t *obj, PinName pin)
     }
 }
 
-static inline uint16_t adc_read(analogin_t *obj)
+uint16_t adc_read(analogin_t *obj)
 {
     ADC_ChannelConfTypeDef sConfig = {0};
 
diff --git a/targets/TARGET_STM/analogin_api.c b/targets/TARGET_STM/analogin_api.c
@@ -29,6 +29,8 @@
 
 #if DEVICE_ANALOGIN
 
+uint16_t adc_read(analogin_t *obj);
+
 uint16_t analogin_read_u16(analogin_t *obj)
 {
     uint16_t value = adc_read(obj);

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ void analogin_init(analogin_t *obj, PinName pin)`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`-static inline uint16_t adc_read(analogin_t *obj)`
	`98`	`+uint16_t adc_read(analogin_t *obj)`
`99`	`99`	`{`
`100`	`100`	`ADC_ChannelConfTypeDef sConfig = {0};`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ void analogin_init(analogin_t *obj, PinName pin)`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`-static inline uint16_t adc_read(analogin_t *obj)`
	`104`	`+uint16_t adc_read(analogin_t *obj)`
`105`	`105`	`{`
`106`	`106`	`ADC_ChannelConfTypeDef sConfig = {0};`
`107`	`107`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void analogin_init(analogin_t *obj, PinName pin)`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`		`-static inline uint16_t adc_read(analogin_t *obj)`
	`118`	`+uint16_t adc_read(analogin_t *obj)`
`119`	`119`	`{`
`120`	`120`	`ADC_ChannelConfTypeDef sConfig = {0};`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ void analogin_init(analogin_t *obj, PinName pin)`
`100`	`100`	`__HAL_ADC_ENABLE(&obj->handle);`
`101`	`101`	`}`
`102`	`102`
`103`		`-static inline uint16_t adc_read(analogin_t *obj)`
	`103`	`+uint16_t adc_read(analogin_t *obj)`
`104`	`104`	`{`
`105`	`105`	`ADC_ChannelConfTypeDef sConfig = {0};`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ void analogin_init(analogin_t *obj, PinName pin)`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`-static inline uint16_t adc_read(analogin_t *obj)`
	`106`	`+uint16_t adc_read(analogin_t *obj)`
`107`	`107`	`{`
`108`	`108`	`ADC_ChannelConfTypeDef sConfig = {0};`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ void analogin_init(analogin_t *obj, PinName pin)`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`-static inline uint16_t adc_read(analogin_t *obj)`
	`102`	`+uint16_t adc_read(analogin_t *obj)`
`103`	`103`	`{`
`104`	`104`	`ADC_ChannelConfTypeDef sConfig = {0};`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`
`30`	`30`	`#if DEVICE_ANALOGIN`
`31`	`31`
	`32`	`+uint16_t adc_read(analogin_t *obj);`
	`33`	`+`
`32`	`34`	`uint16_t analogin_read_u16(analogin_t *obj)`
`33`	`35`	`{`
`34`	`36`	`uint16_t value = adc_read(obj);`