Restored previous version, but remove inline declaration in drv_serial.c to avoid linker errors

This commit is contained in:
sbaron 2013-11-28 12:50:26 +01:00
parent d73061d333
commit da1ecbbbde
2 changed files with 34 additions and 30 deletions

View File

@ -8,4 +8,33 @@ void serialPrint(serialPort_t *instance, const char *str)
}
}
uint32_t serialGetBaudRate(serialPort_t *instance)
{
return instance->baudRate;
}
void serialWrite(serialPort_t *instance, uint8_t ch)
{
instance->vTable->serialWrite(instance, ch);
}
uint8_t serialTotalBytesWaiting(serialPort_t *instance)
{
return instance->vTable->serialTotalBytesWaiting(instance);
}
uint8_t serialRead(serialPort_t *instance)
{
return instance->vTable->serialRead(instance);
}
void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate)
{
instance->vTable->serialSetBaudRate(instance, baudRate);
}
bool isSerialTransmitBufferEmpty(serialPort_t *instance)
{
return instance->vTable->isSerialTransmitBufferEmpty(instance);
}

View File

@ -39,35 +39,10 @@ struct serialPortVTable {
bool (*isSerialTransmitBufferEmpty)(serialPort_t *instance);
};
static inline uint32_t serialGetBaudRate(serialPort_t *instance)
{
return instance->baudRate;
}
static inline void serialWrite(serialPort_t *instance, uint8_t ch)
{
instance->vTable->serialWrite(instance, ch);
}
static inline uint8_t serialTotalBytesWaiting(serialPort_t *instance)
{
return instance->vTable->serialTotalBytesWaiting(instance);
}
static inline uint8_t serialRead(serialPort_t *instance)
{
return instance->vTable->serialRead(instance);
}
static inline void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate)
{
instance->vTable->serialSetBaudRate(instance, baudRate);
}
static inline bool isSerialTransmitBufferEmpty(serialPort_t *instance)
{
return instance->vTable->isSerialTransmitBufferEmpty(instance);
}
inline void serialWrite(serialPort_t *instance, uint8_t ch);
inline uint8_t serialTotalBytesWaiting(serialPort_t *instance);
inline uint8_t serialRead(serialPort_t *instance);
inline void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate);
inline bool isSerialTransmitBufferEmpty(serialPort_t *instance);
void serialPrint(serialPort_t *instance, const char *str);
uint32_t serialGetBaudRate(serialPort_t *instance);