From 4d64fd8faa8b1a0ceb9019446ba6915aaf1812ea Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sat, 9 Mar 2013 11:22:27 +0900
Subject: Add bootmagic.c and fix bootloader_jump
---
protocol/lufa.mk | 4 +++-
protocol/pjrc.mk | 8 ++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
(limited to 'protocol')
diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index 443b85344b..8ea071afbe 100644
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -39,4 +39,6 @@ LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENAB
OPT_DEFS += -DF_USB=$(F_USB)UL
OPT_DEFS += -DARCH=ARCH_$(ARCH)
OPT_DEFS += $(LUFA_OPTS)
-OPT_DEFS += -DHOST_LUFA
+
+# This indicates using LUFA stack
+OPT_DEFS += -DPROTOCOL_LUFA
diff --git a/protocol/pjrc.mk b/protocol/pjrc.mk
index cccdf62042..f5693ba99d 100644
--- a/protocol/pjrc.mk
+++ b/protocol/pjrc.mk
@@ -1,7 +1,5 @@
PJRC_DIR = protocol/pjrc
-OPT_DEFS += -DHOST_PJRC
-
SRC += $(PJRC_DIR)/main.c \
$(PJRC_DIR)/pjrc.c \
$(PJRC_DIR)/usb_keyboard.c \
@@ -19,3 +17,9 @@ endif
# Search Path
VPATH += $(TOP_DIR)/$(PJRC_DIR)
+
+# This indicates using LUFA stack
+# TODO: remove HOST_PJRC
+OPT_DEFS += -DHOST_PJRC
+OPT_DEFS += -DPROTOCOL_PJRC
+
--
cgit v1.2.3
From 09bd1aef12e42b44f90b8275ae95b578294957c0 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 11 Mar 2013 00:14:58 +0900
Subject: Rename HOST_* to PROTOCOL_* in protocol/*.mk
---
protocol/iwrap.mk | 2 +-
protocol/iwrap/main.c | 14 +++++++-------
protocol/pjrc.mk | 3 ---
protocol/vusb.mk | 2 +-
4 files changed, 9 insertions(+), 12 deletions(-)
(limited to 'protocol')
diff --git a/protocol/iwrap.mk b/protocol/iwrap.mk
index 9c83075a4a..96aa4140ca 100644
--- a/protocol/iwrap.mk
+++ b/protocol/iwrap.mk
@@ -1,6 +1,6 @@
IWRAP_DIR = protocol/iwrap
-OPT_DEFS += -DHOST_IWRAP
+OPT_DEFS += -DPROTOCOL_IWRAP
SRC += $(IWRAP_DIR)/iwrap.c \
$(IWRAP_DIR)/suart.S \
diff --git a/protocol/iwrap/main.c b/protocol/iwrap/main.c
index 05a67337fd..ac83280f13 100644
--- a/protocol/iwrap/main.c
+++ b/protocol/iwrap/main.c
@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix.h"
#include "host.h"
#include "iwrap.h"
-#ifdef HOST_VUSB
+#ifdef PROTOCOL_VUSB
# include "vusb.h"
# include "usbdrv.h"
#endif
@@ -78,7 +78,7 @@ static void pullup_pins(void)
*/
-#ifdef HOST_VUSB
+#ifdef PROTOCOL_VUSB
static void disable_vusb(void)
{
// disable interrupt & disconnect to prevent host from enumerating
@@ -131,7 +131,7 @@ int main(void)
//pullup_pins();
//set_prr();
-#ifdef HOST_VUSB
+#ifdef PROTOCOL_VUSB
disable_vusb();
#endif
uart_init(115200);
@@ -159,12 +159,12 @@ int main(void)
last_timer = timer_read();
while (true) {
-#ifdef HOST_VUSB
+#ifdef PROTOCOL_VUSB
if (host_get_driver() == vusb_driver())
usbPoll();
#endif
keyboard_task();
-#ifdef HOST_VUSB
+#ifdef PROTOCOL_VUSB
if (host_get_driver() == vusb_driver())
vusb_transfer_keyboard();
#endif
@@ -258,7 +258,7 @@ static uint8_t console_command(uint8_t c)
print("r: reset. software reset by watchdog\n");
print("i: insomniac. prevent KB from sleeping\n");
print("c: iwrap_call. CALL for BT connection.\n");
-#ifdef HOST_VUSB
+#ifdef PROTOCOL_VUSB
print("u: USB mode. switch to USB.\n");
print("w: BT mode. switch to Bluetooth.\n");
#endif
@@ -281,7 +281,7 @@ static uint8_t console_command(uint8_t c)
print("iwrap_call()\n");
iwrap_call();
return 1;
-#ifdef HOST_VUSB
+#ifdef PROTOCOL_VUSB
case 'u':
print("USB mode\n");
init_vusb();
diff --git a/protocol/pjrc.mk b/protocol/pjrc.mk
index f5693ba99d..27f908b1c2 100644
--- a/protocol/pjrc.mk
+++ b/protocol/pjrc.mk
@@ -19,7 +19,4 @@ endif
VPATH += $(TOP_DIR)/$(PJRC_DIR)
# This indicates using LUFA stack
-# TODO: remove HOST_PJRC
-OPT_DEFS += -DHOST_PJRC
OPT_DEFS += -DPROTOCOL_PJRC
-
diff --git a/protocol/vusb.mk b/protocol/vusb.mk
index 4c5058115b..77b1c6337b 100644
--- a/protocol/vusb.mk
+++ b/protocol/vusb.mk
@@ -1,6 +1,6 @@
VUSB_DIR = protocol/vusb
-OPT_DEFS += -DHOST_VUSB
+OPT_DEFS += -DPROTOCOL_VUSB
SRC += $(VUSB_DIR)/main.c \
$(VUSB_DIR)/vusb.c \
--
cgit v1.2.3