From 8570c25379e168874fb4cdc7ee0590829a0f0d2c Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 17 Oct 2012 14:25:08 +0900
Subject: [PATCH] Fix HHKB iWRAP build

---
 keyboard/hhkb/Makefile.iwrap | 11 ++++++-----
 keyboard/hhkb/config_iwrap.h |  2 +-
 protocol/iwrap.mk            | 10 ++++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/keyboard/hhkb/Makefile.iwrap b/keyboard/hhkb/Makefile.iwrap
index ef7ad2eac2..f87df0d2bb 100644
--- a/keyboard/hhkb/Makefile.iwrap
+++ b/keyboard/hhkb/Makefile.iwrap
@@ -13,7 +13,7 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =	main.c \
+SRC =	\
 	keymap.c \
 	matrix.c \
 	led.c
@@ -28,9 +28,9 @@ OPT_DEFS = -DDEBUG_LEVEL=0
 
 # MCU name, you MUST set this to match the board you are using
 # type "make clean" after changing this, so all files will be rebuilt
-MCU = atmega168p
+MCU = atmega328p
 # avrdude doesn't know atmega168p
-AVRDUDE_MCU = atmega168
+AVRDUDE_MCU = $(MCU)
 
 
 # Processor frequency.
@@ -84,10 +84,11 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
 
 # Search Path
 VPATH = $(TARGET_DIR)
+VPATH += $(TOP_DIR)
 
-include $(TOP_DIR)/protocol/iwrap.mk
+#include $(TOP_DIR)/protocol/iwrap.mk
 # To be swatchable btween Bluetooth and USB. Comment out if you don't need USB.
 include $(TOP_DIR)/protocol/vusb.mk
-include $(TOP_DIR)/protocol.mk
+#include $(TOP_DIR)/protocol.mk
 include $(TOP_DIR)/common.mk
 include $(TOP_DIR)/rules.mk
diff --git a/keyboard/hhkb/config_iwrap.h b/keyboard/hhkb/config_iwrap.h
index 80ab64398b..734d669774 100644
--- a/keyboard/hhkb/config_iwrap.h
+++ b/keyboard/hhkb/config_iwrap.h
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* key combination for command */
-#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT))) 
+#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) 
 
 /* mouse keys */
 #ifdef MOUSEKEY_ENABLE
diff --git a/protocol/iwrap.mk b/protocol/iwrap.mk
index d9906fd1b4..9c83075a4a 100644
--- a/protocol/iwrap.mk
+++ b/protocol/iwrap.mk
@@ -1,9 +1,11 @@
+IWRAP_DIR = protocol/iwrap
+
 OPT_DEFS += -DHOST_IWRAP
 
-SRC +=	iwrap.c \
-	suart.S \
-	sendchar_uart.c \
-	uart.c
+SRC +=	$(IWRAP_DIR)/iwrap.c \
+	$(IWRAP_DIR)/suart.S \
+	$(IWRAP_DIR)/sendchar_uart.c \
+	$(IWRAP_DIR)/uart.c
 
 
 # Search Path