Skip to content

Commit

Permalink
Moving TXCO definition into HardwareSerial.cpp from HardwareSerial.h.
Browse files Browse the repository at this point in the history
Otherwise, you get an error when compiling for processors with no serial port because the header file is always compiled.

See, for an example of the problem: damellis/attiny#8
  • Loading branch information
damellis committed Nov 29, 2012
1 parent 825d68a commit e7a3130
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 16 additions & 0 deletions hardware/arduino/cores/arduino/HardwareSerial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,22 @@

#include "HardwareSerial.h"

/*
* on ATmega8, the uart and its bits are not numbered, so there is no "TXC0"
* definition. It is slightly cleaner to define this here instead of having
* conditional code in the cpp module.
*/
#if !defined(TXC0)
#if defined(TXC)
#define TXC0 TXC
#elif defined(TXC1)
// Some devices have uart1 but no uart0
#define TXC0 TXC1
#else
#error TXC0 not definable in HardwareSerial.h
#endif
#endif

// Define constants and variables for buffering incoming serial data. We're
// using a ring buffer (I think), in which head is the index of the location
// to which to write the next incoming character and tail is the index of the
Expand Down
16 changes: 0 additions & 16 deletions hardware/arduino/cores/arduino/HardwareSerial.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,22 +110,6 @@ class HardwareSerial : public Stream
extern HardwareSerial Serial3;
#endif

/*
* on ATmega8, the uart and its bits are not numbered, so there is no "TXC0"
* definition. It is slightly cleaner to define this here instead of having
* conditional code in the cpp module.
*/
#if !defined(TXC0)
#if defined(TXC)
#define TXC0 TXC
#elif defined(TXC1)
// Some devices have uart1 but no uart0
#define TXC0 TXC1
#else
#error TXC0 not definable in HardwareSerial.h
#endif
#endif

extern void serialEventRun(void) __attribute__((weak));

#endif

0 comments on commit e7a3130

Please sign in to comment.