mx_flasher: minor updates

[megadrive.git] / mx / linux / mx_flasher.c

diff --git a/mx/linux/mx_flasher.c b/mx/linux/mx_flasher.c
index e831d3c..7bebc9c 100644 (file)
--- 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 ''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> 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>
@@ -45,9 +45,10 @@ static const struct {
        { 0x03eb, 0x202d, "32MX+UF Game Device" },
 };
 
-#define VERSION                        "0.9"
+#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
@@ -490,7 +491,7 @@ static int read_write_rom(struct usb_dev_handle *dev, u32 addr, void *buffer, in
                print_progress(total_bytes, total_bytes);
        }
 
-       if (count & 1)
+       if ((count & 1) && !is_write)
                /* work around rw_dev_block() limitation 3 (works for reads only?) */
                rw_dev_block(dev, 0, dummy, sizeof(dummy), 0);
 
@@ -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;
@@ -1013,6 +1015,19 @@ breakloop:
                if (ret < 0)
                        return 1;
 
+               /* align size to 64 */
+               ret = (w_fsize + 63) & ~63;
+               if (w_fsize != ret) {
+                       printf("ROM image size is %d, padding to %d\n", w_fsize, ret);
+                       w_fdata = realloc(w_fdata, ret);
+                       if (w_fdata == NULL) {
+                               fprintf(stderr, "low mem\n");
+                               return 1;
+                       }
+                       memset((char *)w_fdata + w_fsize, 0, ret - w_fsize);
+                       w_fsize = ret;
+               }
+
                if (do_erase_size < w_fsize)
                        do_erase_size = w_fsize;
        }