Skip to content

Commit f29e5db

Browse files
committed
do not use extern inline - C only
1 parent 6599190 commit f29e5db

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

avr/cores/picocore/Arduino.h

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ uint32_t millis();
3737

3838
typedef volatile uint8_t* ioregptr;
3939

40-
extern inline ioregptr portOutputRegister(unsigned addr)
40+
inline ioregptr portOutputRegister(unsigned addr)
4141
{ return (ioregptr) addr; }
4242

43-
extern inline ioregptr portModeRegister(unsigned addr)
43+
inline ioregptr portModeRegister(unsigned addr)
4444
{ return (ioregptr) (addr - 1); }
4545

46-
extern inline ioregptr portInputRegister(unsigned addr)
46+
inline ioregptr portInputRegister(unsigned addr)
4747
{ return (ioregptr) (addr - 2); }
4848

4949
void badArg(const char*) __attribute((error("")));
@@ -61,14 +61,14 @@ inline void check_valid_digital_pin(uint8_t pin)
6161
}
6262
}
6363

64-
extern inline void delayMicroseconds(uint16_t us)
64+
inline void delayMicroseconds(uint16_t us)
6565
{
6666
_delay_us(us);
6767
}
6868

6969
void delay_16ms(uint16_t count);
7070

71-
extern inline void delay(uint16_t ms)
71+
inline void delay(uint16_t ms)
7272
{
7373
if (ms > 16)
7474
delay_16ms(ms/16);
@@ -79,7 +79,7 @@ extern inline void delay(uint16_t ms)
7979
void shiftOut(uint8_t dataPin, uint8_t clockPin, _bitOrder bitOrder, uint8_t value);
8080
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, _bitOrder bitOrder);
8181

82-
extern inline void pinMode(uint8_t pin, _pin_mode mode)
82+
inline void pinMode(uint8_t pin, _pin_mode mode)
8383
{
8484
check_valid_digital_pin(pin);
8585

@@ -90,7 +90,7 @@ extern inline void pinMode(uint8_t pin, _pin_mode mode)
9090
}
9191
}
9292

93-
extern inline void digitalWrite(uint8_t pin, uint8_t val)
93+
inline void digitalWrite(uint8_t pin, uint8_t val)
9494
{
9595
check_valid_digital_pin(pin);
9696

@@ -100,7 +100,7 @@ extern inline void digitalWrite(uint8_t pin, uint8_t val)
100100
PORTB &= ~(1<<pin);
101101
}
102102

103-
extern inline uint8_t digitalRead(uint8_t pin)
103+
inline uint8_t digitalRead(uint8_t pin)
104104
{
105105
check_valid_digital_pin(pin);
106106

@@ -123,15 +123,15 @@ inline void analogWrite(uint8_t pin, uint8_t count)
123123
// set pin to output mode
124124
pinMode(pin, OUTPUT);
125125

126-
uint8_t FastPWM = (1 << WGM00) | (1 << WGM01);
126+
uint8_t PhaseCorrrectPWM = (1 << WGM00) | (0 << WGM01);
127127
if (pin == 0)
128128
{
129-
TCCR0A |= FastPWM | (1 << COM0A1);
129+
TCCR0A |= PhaseCorrrectPWM | (1 << COM0A1);
130130
OCR0A = count;
131131
}
132132
else
133133
{
134-
TCCR0A |= FastPWM | (1 << COM0B1);
134+
TCCR0A |= PhaseCorrrectPWM | (1 << COM0B1);
135135
OCR0B = count;
136136
}
137137
}
@@ -144,7 +144,6 @@ inline void analogReference(_analog_ref ref)
144144
}
145145

146146
// 9 instr / 18B compiled
147-
// try extern inline instead of always_inline?
148147
__attribute((always_inline))
149148
inline int analogRead(_analog_pin pin)
150149
{

0 commit comments

Comments
 (0)