From 4e3109fd216634c9224a15aff7467cffc0ef0555 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Thu, 17 Feb 2011 06:44:29 +0100 Subject: zlib sucks. --- 0001-Adding-windows-support-for-BusPirate.patch | 30 ++++++++++++------------- summon-arm-toolchain | 4 +++- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/0001-Adding-windows-support-for-BusPirate.patch b/0001-Adding-windows-support-for-BusPirate.patch index a46bb5f..fd63596 100644 --- a/0001-Adding-windows-support-for-BusPirate.patch +++ b/0001-Adding-windows-support-for-BusPirate.patch @@ -1,6 +1,6 @@ -From d8db6d57f7c946759478eae88aae554fee4c366e Mon Sep 17 00:00:00 2001 +From 7b575855a953162a463defdb696e57bbe10dc435 Mon Sep 17 00:00:00 2001 From: Nicolas "Pixel" Noble -Date: Sat, 22 Jan 2011 03:52:48 +0100 +Date: Thu, 17 Feb 2011 02:29:19 +0100 Subject: [PATCH] Adding windows support for BusPirate. --- @@ -8,7 +8,7 @@ Subject: [PATCH] Adding windows support for BusPirate. 1 files changed, 112 insertions(+), 23 deletions(-) diff --git a/src/jtag/drivers/buspirate.c b/src/jtag/drivers/buspirate.c -index 13819ba..d22f0d1 100644 +index 836a4d1..9ceaca7 100644 --- a/src/jtag/drivers/buspirate.c +++ b/src/jtag/drivers/buspirate.c @@ -25,9 +25,13 @@ @@ -83,16 +83,16 @@ index 13819ba..d22f0d1 100644 LOG_ERROR("Could not open serial port."); return ERROR_JTAG_INIT_FAILED; } -@@ -267,7 +278,7 @@ COMMAND_HANDLER(buspirate_handle_adc_command) - return ERROR_OK; - } - +@@ -262,7 +273,7 @@ static int buspirate_quit(void) + /* openocd command interface */ + COMMAND_HANDLER(buspirate_handle_adc_command) + { - if (buspirate_fd == -1) + if (buspirate_fd == fdtinvalid) return ERROR_OK; /* send the command */ -@@ -703,7 +714,7 @@ static void buspirate_reset(int trst, int srst) +@@ -704,7 +715,7 @@ static void buspirate_reset(int trst, int srst) } /*************** jtag lowlevel functions ********************/ @@ -111,7 +111,7 @@ index 13819ba..d22f0d1 100644 int ret; char tmp[5]; @@ -766,7 +777,7 @@ static void buspirate_jtag_reset(int fd) - LOG_ERROR("Bad reply :( Please restart manually"); + LOG_ERROR("Unable to restart buspirate!"); } -static void buspirate_jtag_set_speed(int fd, char speed) @@ -119,7 +119,7 @@ index 13819ba..d22f0d1 100644 { int ret; char tmp[2]; -@@ -799,7 +810,7 @@ static void buspirate_jtag_set_speed(int fd, char speed) +@@ -797,7 +808,7 @@ static void buspirate_jtag_set_speed(int fd, char speed) } @@ -128,7 +128,7 @@ index 13819ba..d22f0d1 100644 { char tmp[2]; tmp[0] = CMD_PORT_MODE; -@@ -807,7 +818,7 @@ static void buspirate_jtag_set_mode(int fd, char mode) +@@ -805,7 +816,7 @@ static void buspirate_jtag_set_mode(int fd, char mode) buspirate_jtag_command(fd, tmp, 2); } @@ -137,7 +137,7 @@ index 13819ba..d22f0d1 100644 { char tmp[3]; tmp[0] = CMD_FEATURE; -@@ -816,7 +827,7 @@ static void buspirate_jtag_set_feature(int fd, char feat, char action) +@@ -814,7 +825,7 @@ static void buspirate_jtag_set_feature(int fd, char feat, char action) buspirate_jtag_command(fd, tmp, 3); } @@ -146,7 +146,7 @@ index 13819ba..d22f0d1 100644 { uint8_t tmp[10]; uint16_t a, b, c, d; -@@ -833,7 +844,7 @@ static void buspirate_jtag_get_adcs(int fd) +@@ -831,7 +842,7 @@ static void buspirate_jtag_get_adcs(int fd) ((float)c)/155.1515, ((float)d)/155.1515); } @@ -155,7 +155,7 @@ index 13819ba..d22f0d1 100644 char *cmd, int cmdlen) { int res; -@@ -869,7 +880,84 @@ static unsigned char buspirate_jtag_command(int fd, +@@ -867,7 +878,84 @@ static unsigned char buspirate_jtag_command(int fd, } /* low level serial port */ @@ -241,7 +241,7 @@ index 13819ba..d22f0d1 100644 static int buspirate_serial_open(char *port) { int fd; -@@ -954,6 +1042,7 @@ static void buspirate_serial_close(int fd) +@@ -952,6 +1040,7 @@ static void buspirate_serial_close(int fd) { close(fd); } diff --git a/summon-arm-toolchain b/summon-arm-toolchain index c492a5c..8ad0c77 100755 --- a/summon-arm-toolchain +++ b/summon-arm-toolchain @@ -110,12 +110,14 @@ TAR=tar case "$(uname)" in Linux) echo "Found Linux OS." + GCCFLAGS="--with-system-zlib" ;; Darwin) echo "Found Darwin OS." + GCCFLAGS="--with-system-zlib" ;; MINGW32*) - echo "Found Mingw32" + echo "Found Mingw32" OOCD_EN=0 SUDO= ;; -- cgit v1.2.3