di0ib
/
controller
Observar 1
Favorito 0
Fork 0
Código Versões 0 Atividade
Ver código fonte

Removing unnecessary ifdefs

simple
Jacob Alexander 10 anos atrás
pai
8eba0ae354
commit
643c7e934a
2 arquivos alterados com 9 adições e 23 exclusões
Visão unificada Mostrar estatísticas do Diff
  1. 4
    11
      Output/uartOut/output_com.c
  2. 5
    12
      Output/usbMuxUart/output_com.c

+ 4
- 11
Output/uartOut/output_com.c Ver arquivo

// Sets the device into firmware reload mode // Sets the device into firmware reload mode
inline void Output_firmwareReload() inline void Output_firmwareReload()
{ {
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_)
uart_device_reload(); uart_device_reload();
#endif
} }




// USB Get Character from input buffer // USB Get Character from input buffer
inline int Output_getchar() inline int Output_getchar()
{ {
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_)
return uart_serial_getchar();
#endif
// XXX Make sure to check output_availablechar() first! Information is lost with the cast (error codes) (AVR)
return (int)uart_serial_getchar();
} }




inline int Output_putstr( char* str ) inline int Output_putstr( char* str )
{ {
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
uint16_t count = 0;
#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) // ARM #elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) // ARM
uint32_t count = 0; uint32_t count = 0;
#endif #endif
// Soft Chip Reset // Soft Chip Reset
inline void Output_softReset() inline void Output_softReset()
{ {
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_)
SOFTWARE_RESET();
#endif
usb_device_software_reset();
} }





+ 5
- 12
Output/usbMuxUart/output_com.c Ver arquivo

// Sets the device into firmware reload mode // Sets the device into firmware reload mode
inline void Output_firmwareReload() inline void Output_firmwareReload()
{ {
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_)
uart_device_reload(); uart_device_reload();
#endif
} }




// USB Get Character from input buffer // USB Get Character from input buffer
inline int Output_getchar() inline int Output_getchar()
{ {
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_)
// XXX Make sure to check output_availablechar() first! Information is lost with the cast (error codes) (AVR)
if ( usb_serial_available() > 0 ) if ( usb_serial_available() > 0 )
{ {
return usb_serial_getchar();
return (int)usb_serial_getchar();
} }


if ( uart_serial_available() > 0 ) if ( uart_serial_available() > 0 )
{ {
return uart_serial_getchar();
return (int)uart_serial_getchar();
} }


return -1; return -1;
#endif
} }




inline int Output_putstr( char* str ) inline int Output_putstr( char* str )
{ {
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
uint16_t count = 0;
#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) // ARM #elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) // ARM
uint32_t count = 0; uint32_t count = 0;
#endif #endif
// Soft Chip Reset // Soft Chip Reset
inline void Output_softReset() inline void Output_softReset()
{ {
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_)
SOFTWARE_RESET();
#endif
usb_device_software_reset();
} }