From 3d12b7066d27b591e0283e20ed066bc66e29fbe4 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 10 Nov 2023 21:34:40 -0700
Subject: refactor checkpoint: splitting MCU-specific code into arch/$MCU.[ch]

Phew, that's a lot of changes!  And there's still a lot more to do...
---
 hw/wurkkos/ts10/hwdef.h | 6 +-----
 hw/wurkkos/ts25/hwdef.h | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'hw/wurkkos')

diff --git a/hw/wurkkos/ts10/hwdef.h b/hw/wurkkos/ts10/hwdef.h
index b1239b8..92898fb 100644
--- a/hw/wurkkos/ts10/hwdef.h
+++ b/hw/wurkkos/ts10/hwdef.h
@@ -13,9 +13,7 @@
  * Voltage:    VCC
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE wurkkos/ts10/hwdef.c
+#define HWDEF_C  wurkkos/ts10/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-aux.h"
@@ -60,12 +58,10 @@ enum CHANNEL_MODES {
 
 // e-switch
 #define SWITCH_PIN      PIN5_bp
-//#define SWITCH_PCINT    PCINT0
 #define SWITCH_PORT     VPORTA.IN
 #define SWITCH_ISC_REG  PORTA.PIN2CTRL
 #define SWITCH_VECT     PORTA_PORT_vect
 #define SWITCH_INTFLG   VPORTA.INTFLAGS
-//#define PCINT_vect      PCINT0_vect
 
 // average drop across diode on this hardware
 #ifndef VOLTAGE_FUDGE_FACTOR
diff --git a/hw/wurkkos/ts25/hwdef.h b/hw/wurkkos/ts25/hwdef.h
index 024a18d..ac1e574 100644
--- a/hw/wurkkos/ts25/hwdef.h
+++ b/hw/wurkkos/ts25/hwdef.h
@@ -14,9 +14,7 @@
  * Aux Blue:   PC1
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE wurkkos/ts25/hwdef.c
+#define HWDEF_C  wurkkos/ts25/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -61,12 +59,10 @@ enum CHANNEL_MODES {
 
 // e-switch
 #define SWITCH_PIN      PIN5_bp
-//#define SWITCH_PCINT    PCINT0
 #define SWITCH_PORT     VPORTA.IN
 #define SWITCH_ISC_REG  PORTA.PIN2CTRL
 #define SWITCH_VECT     PORTA_PORT_vect
 #define SWITCH_INTFLG   VPORTA.INTFLAGS
-//#define PCINT_vect      PCINT0_vect
 
 // average drop across diode on this hardware
 #ifndef VOLTAGE_FUDGE_FACTOR
-- 
cgit v1.2.3


From ed5e1dde6181ce71da96d7e920950830c0b869cb Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 19 Nov 2023 01:45:13 -0700
Subject: missed a "include -> HWDEF_H" conversion earlier

---
 hw/wurkkos/ts25/anduril.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'hw/wurkkos')

diff --git a/hw/wurkkos/ts25/anduril.h b/hw/wurkkos/ts25/anduril.h
index 722bc5d..ecf0db1 100644
--- a/hw/wurkkos/ts25/anduril.h
+++ b/hw/wurkkos/ts25/anduril.h
@@ -3,7 +3,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "wurkkos/ts25/hwdef.h"
+//#include "wurkkos/ts25/hwdef.h"
+#define HWDEF_H  wurkkos/ts25/hwdef.h
 #include "wurkkos/anduril.h"
 
 // this light has three aux LED channels: R, G, B
-- 
cgit v1.2.3