aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgermeier <germeier>2002-09-20 20:49:36 +0000
committergermeier <germeier>2002-09-20 20:49:36 +0000
commitdb746a3a55709a20183ecc33a1b6a5b40d863702 (patch)
tree89a20301b475d041b4ad55d859f0b81e7e320611
parent21ec3fac700bf50b8c5cfafa6b6b5a86599fa9e2 (diff)
downloadmpiosh-db746a3a55709a20183ecc33a1b6a5b40d863702.tar.gz
mpiosh-db746a3a55709a20183ecc33a1b6a5b40d863702.tar.bz2
mpiosh-db746a3a55709a20183ecc33a1b6a5b40d863702.zip
small fixes to mpiosh/callback.c
added code to identify DMG+ (assumed, but should be correct)
-rw-r--r--ChangeLog9
-rw-r--r--libmpio/defs.h11
-rw-r--r--libmpio/io.c3
-rw-r--r--libmpio/mpio.c5
-rw-r--r--mpiosh/callback.c13
5 files changed, 33 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 0631a9c..21b6c9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-20 Markus Germeier <mager@tzi.de>
+
+ * libmpio/mpio.c (mpio_init):
+ added code to identify DMG+ (assumed, but should be correct)
+
+ * mpiosh/callback.c (mpiosh_cmd_format, mpiosh_cmd_mem):
+ added warning messages for the upcoming release.
+ (mpiosh_cmd_get, mpiosh_cmd_put): added missing printf
+
2002-09-20 Andreas Buesching <crunchy@tzi.de>
* mpiosh/mpiosh.c (mpiosh_command_regex_fix): bug fix for .*
diff --git a/libmpio/defs.h b/libmpio/defs.h
index 70f789f..910df64 100644
--- a/libmpio/defs.h
+++ b/libmpio/defs.h
@@ -1,7 +1,7 @@
/* -*- linux-c -*- */
/*
- * $Id: defs.h,v 1.7 2002/09/19 20:46:02 crunchy Exp $
+ * $Id: defs.h,v 1.8 2002/09/20 20:49:36 germeier Exp $
*
* Library for USB MPIO-*
*
@@ -41,10 +41,11 @@ typedef enum { MPIO_INTERNAL_MEM = 0x01,
/* model type */
typedef enum { MPIO_MODEL_DME = 0x00,
MPIO_MODEL_DMG = 0x01,
- MPIO_MODEL_DMB = 0x02,
- MPIO_MODEL_DMB_PLUS = 0x03,
- MPIO_MODEL_DMK = 0x04,
- MPIO_MODEL_UNKNOWN = 0x05 } mpio_model_t;
+ MPIO_MODEL_DMG_PLUS = 0x02,
+ MPIO_MODEL_DMB = 0x03,
+ MPIO_MODEL_DMB_PLUS = 0x04,
+ MPIO_MODEL_DMK = 0x05,
+ MPIO_MODEL_UNKNOWN = 0x06 } mpio_model_t;
/* USB commands */
typedef enum { GET_VERSION = 0x01,
diff --git a/libmpio/io.c b/libmpio/io.c
index ca2c033..ad5df53 100644
--- a/libmpio/io.c
+++ b/libmpio/io.c
@@ -2,7 +2,7 @@
/*
*
- * $Id: io.c,v 1.14 2002/09/18 22:18:29 germeier Exp $
+ * $Id: io.c,v 1.15 2002/09/20 20:49:36 germeier Exp $
*
* Library for USB MPIO-*
*
@@ -58,6 +58,7 @@ model2externalmem(mpio_model_t model)
switch(model)
{
case MPIO_MODEL_DMG:
+ case MPIO_MODEL_DMG_PLUS:
m = 0x80;
break;
default:
diff --git a/libmpio/mpio.c b/libmpio/mpio.c
index f9da4b8..fdfba8b 100644
--- a/libmpio/mpio.c
+++ b/libmpio/mpio.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: mpio.c,v 1.23 2002/09/19 22:23:01 crunchy Exp $
+ * $Id: mpio.c,v 1.24 2002/09/20 20:49:36 germeier Exp $
*
* Library for USB MPIO-*
*
@@ -46,6 +46,7 @@
static BYTE *mpio_model_name[] = {
"MPIO-DME",
"MPIO-DMG",
+ "MPIO-DMG+",
"MPIO-DMB",
"MPIO-DMB+",
"MPIO-DMK",
@@ -219,6 +220,8 @@ mpio_init(BYTE (*progress_callback)(int, int))
break ;
case 'G':
new_mpio->model = MPIO_MODEL_DMG;
+ if (new_mpio->version[6] == 'P')
+ new_mpio->model = MPIO_MODEL_DMG_PLUS; /* should be right */
break ;
case 'B':
new_mpio->model = MPIO_MODEL_DMB;
diff --git a/mpiosh/callback.c b/mpiosh/callback.c
index 3e8cb13..0376989 100644
--- a/mpiosh/callback.c
+++ b/mpiosh/callback.c
@@ -2,7 +2,7 @@
*
* Author: Andreas Bsching <crunchy@tzi.de>
*
- * $Id: callback.c,v 1.15 2002/09/19 22:23:01 crunchy Exp $
+ * $Id: callback.c,v 1.16 2002/09/20 20:49:36 germeier Exp $
*
* Copyright (C) 2001 Andreas Bsching <crunchy@tzi.de>
*
@@ -169,6 +169,10 @@ mpiosh_cmd_mem(char *args[])
if (mpio_memory_free(mpiosh.dev, MPIO_EXTERNAL_MEM, &free)) {
mpiosh.card = MPIO_EXTERNAL_MEM;
mpiosh.prompt = PROMPT_EXT;
+ printf("WARNING\n");
+ printf("Support for external memory is not complete and will"
+ " probably *not* work !!\n");
+ printf("WARNING\n");
printf("external memory card is selected\n");
} else {
printf("no external memory card is available\n");
@@ -256,6 +260,7 @@ mpiosh_cmd_get(char *args[])
mpiosh_callback_get) == -1) {
mpio_perror("error");
}
+ printf("\n");
}
void
@@ -337,6 +342,7 @@ mpiosh_cmd_put(char *args[])
} else {
mpio_sync(mpiosh.dev, mpiosh.card);
}
+ printf("\n");
}
void
@@ -550,6 +556,11 @@ mpiosh_cmd_format(char *args[])
MPIOSH_CHECK_CONNECTION_CLOSED;
UNUSED(args);
+
+ printf("WARNING\n");
+ printf("Support for formatting memory is not complete and has"
+ " some known issues!!\n");
+ printf("WARNING\n");
printf("This will destroy all tracks saved on the memory card. "
"Are you sure (y/n)? ");