From 0ea882bc247b3cca8788f329d9fe802107fa8960 Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Tue, 10 Jan 2012 16:00:46 -0500
Subject: fixed warning when comparing pgm_read_word(0) to -1 (thanks, Limor
 Fried and Phillip Torrone)

---
 bootloaders/diskloader/src/DiskLoader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bootloaders/diskloader')

diff --git a/bootloaders/diskloader/src/DiskLoader.cpp b/bootloaders/diskloader/src/DiskLoader.cpp
index d14c7fb..7ef6fa8 100644
--- a/bootloaders/diskloader/src/DiskLoader.cpp
+++ b/bootloaders/diskloader/src/DiskLoader.cpp
@@ -117,7 +117,7 @@ int main()
 	TX_LED_OFF();
 	RX_LED_OFF();
 	L_LED_OFF();
-	if (MCUSR_state & (1<<WDRF) && (pgm_read_word(0) != -1)) {
+	if (MCUSR_state & (1<<WDRF) && (pgm_read_word(0) != 0xFFFF)) {
 		StartSketch();				// if the reset was caused by WDT and if a sketch is already present then run the sketch instead of the bootloader
 	}	
 	BOARD_INIT();
@@ -126,7 +126,7 @@ int main()
 	_inSync = STK_INSYNC;
 	_ok = STK_OK;
 
-	if (pgm_read_word(0) != -1)
+	if (pgm_read_word(0) != 0xFFFF)
 		_ejected = 1;
 
 	for(;;)
-- 
cgit v1.2.3-18-g5258