Move include/$arch to include/arch/$arch to be consistent with src/ hierarchy

7 files changed, 257 insertions, 0 deletions

diff --git a/include/arch/msp430fr5969lp/driver/adc.h b/include/arch/msp430fr5969lp/driver/adc.h
new file mode 100644
index 0000000..d93aed4
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/adc.h
@@ -0,0 +1,17 @@
+#ifndef ADC_H
+#define ADC_H
+
+class ADC {
+	private:
+		ADC(ADC const &copy);
+
+	public:
+		ADC() {}
+
+		float getTemp();
+		float getVCC();
+};
+
+extern ADC adc;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/gpio.h b/include/arch/msp430fr5969lp/driver/gpio.h
new file mode 100644
index 0000000..caed74a
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/gpio.h
@@ -0,0 +1,130 @@
+#ifndef GPIO_H
+#define GPIO_H
+
+#include <msp430.h>
+
+class GPIO {
+	private:
+		GPIO(const GPIO &copy);
+
+	public:
+		GPIO () {}
+
+		enum Pin : unsigned char {
+			p1_0 = 0, p1_1, p1_2, p1_3, p1_4, p1_5, p1_6, p1_7,
+			p2_0, p2_1, p2_2, p2_3, p2_4, p2_5, p2_6, p2_7,
+			p3_0, p3_1, p3_2, p3_3, p3_4, p3_5, p3_6, p3_7,
+			p4_0, p4_1, p4_2, p4_3, p4_4, p4_5, p4_6, p4_7,
+			pj_0, pj_1, pj_2, pj_3, pj_4, pj_5, pj_6, pj_7,
+			PIN_INVALID
+		};
+
+		inline void setup() {
+			P1OUT = 0;
+			P2OUT = 0;
+			P3OUT = 0;
+			P4OUT = 0;
+			P1DIR = BIT0;
+			P2DIR = 0;
+			P3DIR = 0;
+			P4DIR = BIT6;
+		}
+		inline void led_on(unsigned char id) {
+			if (id == 0) {
+				P1OUT |= BIT0;
+			} else {
+				P4OUT |= BIT6;
+			}
+		}
+		inline void led_off(unsigned char id) {
+			if (id == 0) {
+				P1OUT &= ~BIT0;
+			} else {
+				P4OUT &= ~BIT6;
+			}
+		}
+		inline void led_toggle(unsigned char id) {
+			if (id == 0) {
+				P1OUT ^= BIT0;
+			} else {
+				P4OUT ^= BIT6;
+			}
+		}
+		inline void input(unsigned char const pin) {
+			if (pin < p2_0) {
+				P1DIR &= ~(1 << pin);
+			} else if (pin < p3_0) {
+				P2DIR &= ~(1 << (pin - p2_0));
+			} else if (pin < p4_0) {
+				P3DIR &= ~(1 << (pin - p3_0));
+			} else if (pin < pj_0) {
+				P4DIR &= ~(1 << (pin - p4_0));
+			} else if (pin < PIN_INVALID) {
+				PJDIR &= ~(1 << (pin - pj_0));
+			}
+		}
+		inline void output(unsigned char const pin) {
+			if (pin < p2_0) {
+				P1DIR |= (1 << pin);
+			} else if (pin < p3_0) {
+				P2DIR |= (1 << (pin - p2_0));
+			} else if (pin < p4_0) {
+				P3DIR |= (1 << (pin - p3_0));
+			} else if (pin < pj_0) {
+				P4DIR |= (1 << (pin - p4_0));
+			} else if (pin < PIN_INVALID) {
+				PJDIR |= (1 << (pin - pj_0));
+			}
+		}
+		inline unsigned char read(unsigned char const pin) {
+			if (pin < p2_0) {
+				return P1IN & (1 << pin);
+			} else if (pin < p3_0) {
+				return P2IN & (1 << (pin - p2_0));
+			} else if (pin < p4_0) {
+				return P3IN & (1 << (pin - p3_0));
+			} else if (pin < pj_0) {
+				return P4IN & (1 << (pin - p4_0));
+			} else if (pin < PIN_INVALID) {
+				return PJIN & (1 << (pin - pj_0));
+			}
+			return 0;
+		}
+		inline void write(unsigned char const pin, unsigned char value) {
+			if (pin < p2_0) {
+				if (value) {
+					P1OUT |= (1 << pin);
+				} else {
+					P1OUT &= ~(1 << pin);
+				}
+			} else if (pin < p3_0) {
+				if (value) {
+					P2OUT |= (1 << (pin - p2_0));
+				} else {
+					P2OUT &= ~(1 << (pin - p2_0));
+				}
+			} else if (pin < p4_0) {
+				if (value) {
+					P3OUT |= (1 << (pin - p3_0));
+				} else {
+					P3OUT &= ~(1 << (pin - p3_0));
+				}
+			} else if (pin < pj_0) {
+				if (value) {
+					P4OUT |= (1 << (pin - p4_0));
+				} else {
+					P4OUT &= ~(1 << (pin - p4_0));
+				}
+			} else if (pin < PIN_INVALID) {
+				if (value) {
+					PJOUT |= (1 << (pin - pj_0));
+				} else {
+					PJOUT &= ~(1 << (pin - pj_0));
+				}
+			}
+		}
+};
+
+extern GPIO gpio;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/i2c.h b/include/arch/msp430fr5969lp/driver/i2c.h
new file mode 100644
index 0000000..6d6ea66
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/i2c.h
@@ -0,0 +1,19 @@
+#ifndef I2C_H
+#define I2C_H
+
+class I2C {
+	private:
+		I2C(const I2C &copy);
+
+	public:
+		I2C () {}
+		signed char setup();
+		void scan(unsigned int *results);
+		signed char xmit(unsigned char address,
+				unsigned char tx_len, unsigned char *tx_buf,
+				unsigned char rx_len, unsigned char *rx_buf);
+};
+
+extern I2C i2c;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/spi_b.h b/include/arch/msp430fr5969lp/driver/spi_b.h
new file mode 100644
index 0000000..4be7346
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/spi_b.h
@@ -0,0 +1,18 @@
+#ifndef SPI_H
+#define SPI_H
+
+class SPI {
+	private:
+		SPI(const SPI &copy);
+
+	public:
+		SPI () {}
+		void setup();
+		signed char xmit(
+				unsigned char tx_len, unsigned char *tx_buf,
+				unsigned char rx_len, unsigned char *rx_buf);
+};
+
+extern SPI spi;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/stdin.h b/include/arch/msp430fr5969lp/driver/stdin.h
new file mode 100644
index 0000000..6462e0c
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/stdin.h
@@ -0,0 +1,24 @@
+#ifndef STANDARDINPUT_H
+#define STANDARDINPUT_H
+
+class StandardInput {
+	private:
+		StandardInput(const StandardInput &copy);
+		char buffer[8];
+		unsigned char write_pos, read_pos;
+
+	public:
+		StandardInput() : write_pos(0), read_pos(0) {}
+		void setup();
+		bool hasKey();
+		char getKey();
+
+		inline void addKey(char key) {
+			buffer[write_pos++] = key;
+			write_pos %= 8;
+		}
+};
+
+extern StandardInput kin;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/stdout.h b/include/arch/msp430fr5969lp/driver/stdout.h
new file mode 100644
index 0000000..2eb669d
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/stdout.h
@@ -0,0 +1,19 @@
+#ifndef STANDARDOUTPUT_H
+#define STANDARDOUTPUT_H
+
+#include "object/outputstream.h"
+
+class StandardOutput : public OutputStream {
+	private:
+		StandardOutput(const StandardOutput &copy);
+
+	public:
+		StandardOutput () {}
+		void setup();
+
+		virtual void put(char c) override;
+};
+
+extern StandardOutput kout;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/uptime.h b/include/arch/msp430fr5969lp/driver/uptime.h
new file mode 100644
index 0000000..3a52840
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/uptime.h
@@ -0,0 +1,30 @@
+#ifndef UPTIME_H
+#define UPTIME_H
+
+#include <msp430.h>
+#include <stdint.h>
+
+class Uptime {
+	private:
+		Uptime(const Uptime &copy);
+#ifdef TIMER_S
+		uint16_t seconds;
+#endif
+
+	public:
+#ifdef TIMER_S
+		Uptime () : seconds(0) {}
+#else
+		Uptime () {}
+#endif
+		inline uint16_t get_us() { return TA0R; }
+		inline uint16_t get_cycles() { return TA2R; }
+#ifdef TIMER_S
+		inline uint16_t get_s() { return seconds; }
+		inline void tick_s() { seconds++; }
+#endif
+};
+
+extern Uptime uptime;
+
+#endif