From: notaz <notasas@gmail.com>
Date: Mon, 12 Aug 2013 22:26:11 +0000 (+0300)
Subject: mx_flasher: minor updates
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=megadrive.git;a=commitdiff_plain;h=faf0bb13c01f2932c333b03209ac1f15deff01e1

mx_flasher: minor updates
---

diff --git a/mx/linux/Makefile b/mx/linux/Makefile
index 0ba9893..d97f9fb 100644
--- a/mx/linux/Makefile
+++ b/mx/linux/Makefile
@@ -1,8 +1,8 @@
 
 CC ?= $(CROSS)gcc
 
-CFLAGS += -Wall -O2 -ggdb
-LDFLAGS += -lusb
+CFLAGS += -Wall -O2 -ggdb -fno-strict-aliasing
+LDLIBS += -lusb
 TARGET = mx_flasher
 
 all: $(TARGET)
diff --git a/mx/linux/mx_flasher.c b/mx/linux/mx_flasher.c
index 62bb0b6..7bebc9c 100644
--- a/mx/linux/mx_flasher.c
+++ b/mx/linux/mx_flasher.c
@@ -13,16 +13,16 @@
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <stdio.h>
 #include <string.h>
@@ -47,7 +47,8 @@ static const struct {
 
 #define VERSION			"0.91"
 
-#define IO_BLK_SIZE		0x2000	/* 8K */
+//#define IO_BLK_SIZE		0x2000	/* 8K - unreliable? */
+#define IO_BLK_SIZE		0x800
 #define IO_RAM_BLK_SIZE		256
 
 #define CMD_ATM_READY		0x22
@@ -1003,7 +1004,8 @@ breakloop:
 		if (do_check && (w_fname[ret - 4] == '.' || w_fname[ret - 3] == '.' ||
 				w_fname[ret - 2] == '.') &&
 				strcasecmp(&w_fname[ret - 4], ".gen") != 0 &&
-				strcasecmp(&w_fname[ret - 4], ".bin") != 0) {
+				strcasecmp(&w_fname[ret - 4], ".bin") != 0 &&
+				strcasecmp(&w_fname[ret - 4], ".32x") != 0) {
 			fprintf(stderr, "\"%s\" doesn't look like a game ROM, aborting "
 					"(use -f to disable this check)\n", w_fname);
 			return 1;