--- trunk/src/diskimage.c	2007/10/08 16:18:11	6
+++ trunk/src/diskimage.c	2007/10/08 16:18:38	12
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: diskimage.c,v 1.91 2005/05/27 07:29:24 debug Exp $
+ *  $Id: diskimage.c,v 1.95 2005/08/10 22:25:50 debug Exp $
  *
  *  Disk image support.
  *
@@ -409,7 +409,7 @@
 static int diskimage__internal_access(struct diskimage *d, int writeflag,
 	off_t offset, unsigned char *buf, size_t len)
 {
-	size_t lendone;
+	ssize_t lendone;
 	int res;
 
 	if (buf == NULL) {
@@ -919,7 +919,7 @@
 			    xferp->data_in, size);
 
 		if (d->is_a_tape && d->f != NULL)
-			d->tape_offset = ftell(d->f);
+			d->tape_offset = ftello(d->f);
 
 		/*  TODO: other errors?  */
 		break;
@@ -1006,7 +1006,7 @@
 		if (xferp->cmd_len != 6)
 			debug(" (weird len=%i)", xferp->cmd_len);
 
-		for (i=0; i<xferp->cmd_len ; i++)
+		for (i=0; i<xferp->cmd_len; i++)
 			debug(" %02x", xferp->cmd[i]);
 
 		/*  TODO: actualy care about cmd[]  */
@@ -1303,6 +1303,7 @@
 		    &xferp->data_in, retlen, 1);
 
 		diskimage__return_default_status_and_message(xferp);
+
 		break;
 
 	default:
@@ -1474,6 +1475,7 @@
 	/*  Special cases: some machines usually have FLOPPY/IDE, not SCSI:  */
 	if (machine->arch == ARCH_X86 ||
 	    machine->machine_type == MACHINE_COBALT ||
+	    machine->machine_type == MACHINE_EVBMIPS ||
 	    machine->machine_type == MACHINE_HPCMIPS ||
 	    machine->machine_type == MACHINE_PS2)
 		d->type = DISKIMAGE_IDE;