[MPIO-cvslog] mpio/libmpio defs.h,1.35,1.36 mpio.h,1.23,1.24

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mpio/mpio/libmpio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2698/libmpio

Modified Files:
	defs.h mpio.h 
Log Message:
       * changed version to 0.7.1-pre3
       * (hopefully) fixed signedness hell,
          should fix problems with 64 bit machines


Index: defs.h
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/defs.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** defs.h	30 May 2004 16:28:51 -0000	1.35
--- defs.h	21 Jan 2006 18:33:20 -0000	1.36
***************
*** 36,39 ****
--- 36,40 ----
  
  typedef unsigned char  BYTE;
+ typedef char CHAR;
  typedef unsigned short WORD;
  typedef unsigned int   DWORD;
***************
*** 111,115 ****
  /* filenames */
  #define MPIO_FILENAME_LEN    129
! typedef BYTE mpio_filename_t[MPIO_FILENAME_LEN];
  
  #ifndef NULL
--- 112,116 ----
  /* filenames */
  #define MPIO_FILENAME_LEN    129
! typedef CHAR mpio_filename_t[MPIO_FILENAME_LEN];
  
  #ifndef NULL
***************
*** 180,191 ****
  
  typedef struct {
!   BYTE firmware_id[INFO_LINE];  
!   BYTE firmware_version[INFO_LINE];
!   BYTE firmware_date[INFO_LINE];
  
!   BYTE model[INFO_LINE];
  
!   BYTE mem_internal[INFO_LINE];
!   BYTE mem_external[INFO_LINE];
    
  } mpio_info_t;
--- 181,192 ----
  
  typedef struct {
!   CHAR firmware_id[INFO_LINE];  
!   CHAR firmware_version[INFO_LINE];
!   CHAR firmware_date[INFO_LINE];
  
!   CHAR model[INFO_LINE];
  
!   CHAR mem_internal[INFO_LINE];
!   CHAR mem_external[INFO_LINE];
    
  } mpio_info_t;
***************
*** 194,203 ****
  typedef struct {
    /* everything we get from GET_VERSION */
!   BYTE id[12];
!   BYTE major[3];
!   BYTE minor[3];
!   BYTE year[5];
!   BYTE month[3];
!   BYTE day[3];  
  } mpio_firmware_t;
  
--- 195,204 ----
  typedef struct {
    /* everything we get from GET_VERSION */
!   CHAR id[12];
!   CHAR major[3];
!   CHAR minor[3];
!   CHAR year[5];
!   CHAR month[3];
!   CHAR day[3];  
  } mpio_firmware_t;
  
***************
*** 213,217 ****
  
  struct mpio_directory_tx {
!   BYTE name[INFO_LINE];
    BYTE dir[MEGABLOCK_SIZE];
    
--- 214,218 ----
  
  struct mpio_directory_tx {
!   CHAR name[INFO_LINE];
    BYTE dir[MEGABLOCK_SIZE];
    
***************
*** 295,299 ****
  /* view of the MPIO-* */
  typedef struct {
!   BYTE version[CMD_SIZE];
    
    int fd;
--- 296,300 ----
  /* view of the MPIO-* */
  typedef struct {
!   CHAR version[CMD_SIZE];
    
    int fd;
***************
*** 304,312 ****
    int usb_out_ep;
    int usb_in_ep;
!   BYTE *charset;                   /* charset used for filename conversion */
  
    BYTE id3;                        /* enable/disable ID3 rewriting support */
!   BYTE id3_format[INFO_LINE];
!   BYTE id3_temp[INFO_LINE];
    
    mpio_firmware_t firmware;  
--- 305,313 ----
    int usb_out_ep;
    int usb_in_ep;
!   CHAR *charset;                   /* charset used for filename conversion */
  
    BYTE id3;                        /* enable/disable ID3 rewriting support */
!   CHAR id3_format[INFO_LINE];
!   CHAR id3_temp[INFO_LINE];
    
    mpio_firmware_t firmware;  
***************
*** 343,348 ****
  
  typedef struct  { // Short 8.3 names 
!   unsigned char name[8];          // file name 
!   unsigned char ext[3];           // file extension 
    unsigned char attr;             // attribute byte 
    unsigned char lcase;		  // Case for base and extension
--- 344,349 ----
  
  typedef struct  { // Short 8.3 names 
!   char name[8];          // file name 
!   char ext[3];           // file extension 
    unsigned char attr;             // attribute byte 
    unsigned char lcase;		  // Case for base and extension
***************
*** 360,370 ****
  typedef struct  { // Up to 13 characters of a long name 
    unsigned char id;               // sequence number for slot 
!   unsigned char name0_4[10];      // first 5 characters in name 
    unsigned char attr;             // attribute byte
    unsigned char reserved;         // always 0 
    unsigned char alias_checksum;   // checksum for 8.3 alias 
!   unsigned char name5_10[12];     // 6 more characters in name
    unsigned char start[2];         // starting cluster number
!   unsigned char name11_12[4];     // last 2 characters in name
  } mpio_dir_slot_t;
  
--- 361,371 ----
  typedef struct  { // Up to 13 characters of a long name 
    unsigned char id;               // sequence number for slot 
!   char name0_4[10];      // first 5 characters in name 
    unsigned char attr;             // attribute byte
    unsigned char reserved;         // always 0 
    unsigned char alias_checksum;   // checksum for 8.3 alias 
!   char name5_10[12];     // 6 more characters in name
    unsigned char start[2];         // starting cluster number
!   char name11_12[4];     // last 2 characters in name
  } mpio_dir_slot_t;
  

Index: mpio.h
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/mpio.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** mpio.h	19 Oct 2003 21:06:34 -0000	1.23
--- mpio.h	21 Jan 2006 18:33:20 -0000	1.24
***************
*** 60,64 ****
  mpio_model_t	mpio_get_model(mpio_t *);
  /* retrieves free memory in bytes */
! int	mpio_memory_free(mpio_t *, mpio_mem_t, int *free);
  
  /* report sectors in block for this memory */
--- 60,64 ----
  mpio_model_t	mpio_get_model(mpio_t *);
  /* retrieves free memory in bytes */
! int	mpio_memory_free(mpio_t *, mpio_mem_t, DWORD *free);
  
  /* report sectors in block for this memory */
***************
*** 70,75 ****
   * charset for filename encoding/converting
   */
! BYTE  *mpio_charset_get(mpio_t *);
! BYTE   mpio_charset_set(mpio_t *, BYTE *);
  
  /* 
--- 70,75 ----
   * charset for filename encoding/converting
   */
! CHAR  *mpio_charset_get(mpio_t *);
! BYTE   mpio_charset_set(mpio_t *, CHAR *);
  
  /* 
***************
*** 80,92 ****
  BYTE*	mpio_directory_open(mpio_t *, mpio_mem_t);
  /* context, memory bank, directory name */
! int     mpio_directory_make(mpio_t *, mpio_mem_t, BYTE *);
  /* context, memory bank, directory name */
! int     mpio_directory_cd(mpio_t *, mpio_mem_t, BYTE *);
  /* context, memory bank, directory name buffer space */
! void    mpio_directory_pwd(mpio_t *, mpio_mem_t, BYTE pwd[INFO_LINE]);  
  /* context, dir context */
  BYTE*	mpio_dentry_next(mpio_t *, mpio_mem_t, BYTE *);
  /* context, dir context */
! int	mpio_dentry_get(mpio_t *, mpio_mem_t, BYTE *, BYTE *, int,WORD *,
  			BYTE *, BYTE *, BYTE *, BYTE *, DWORD *, BYTE *);
  
--- 80,92 ----
  BYTE*	mpio_directory_open(mpio_t *, mpio_mem_t);
  /* context, memory bank, directory name */
! int     mpio_directory_make(mpio_t *, mpio_mem_t, CHAR *);
  /* context, memory bank, directory name */
! int     mpio_directory_cd(mpio_t *, mpio_mem_t, CHAR *);
  /* context, memory bank, directory name buffer space */
! void    mpio_directory_pwd(mpio_t *, mpio_mem_t, CHAR pwd[INFO_LINE]);  
  /* context, dir context */
  BYTE*	mpio_dentry_next(mpio_t *, mpio_mem_t, BYTE *);
  /* context, dir context */
! int	mpio_dentry_get(mpio_t *, mpio_mem_t, BYTE *, CHAR *, int,WORD *,
  			BYTE *, BYTE *, BYTE *, BYTE *, DWORD *, BYTE *);
  
***************
*** 122,126 ****
    
  int	mpio_file_get_to_memory(mpio_t *, mpio_mem_t, mpio_filename_t, 
! 				mpio_callback_t, BYTE **); 
  
  /* context, memory bank, filename, filetype, callback ... */
--- 122,126 ----
    
  int	mpio_file_get_to_memory(mpio_t *, mpio_mem_t, mpio_filename_t, 
! 				mpio_callback_t, CHAR **); 
  
  /* context, memory bank, filename, filetype, callback ... */
***************
*** 128,132 ****
  int	mpio_file_put_from_memory(mpio_t *, mpio_mem_t, mpio_filename_t, 
  				  mpio_filetype_t, mpio_callback_t,
! 				  BYTE *, int);
  
  /* check if file exists on selected memory */
--- 128,132 ----
  int	mpio_file_put_from_memory(mpio_t *, mpio_mem_t, mpio_filename_t, 
  				  mpio_filetype_t, mpio_callback_t,
! 				  CHAR *, int);
  
  /* check if file exists on selected memory */
***************
*** 180,186 ****
  
  /* set format string for rewriting*/
! void   mpio_id3_format_set(mpio_t *, BYTE *);
  /* get format string for rewriting*/
! void   mpio_id3_format_get(mpio_t *, BYTE *);
  
  /*
--- 180,186 ----
  
  /* set format string for rewriting*/
! void   mpio_id3_format_set(mpio_t *, CHAR *);
  /* get format string for rewriting*/
! void   mpio_id3_format_get(mpio_t *, CHAR *);
  
  /*