[MPIO-cvslog] mpio/libmpio/src cis.h,1.3,1.4 directory.c,1.13,1.14 directory.h,1.4,1.5 ecc.c,1.6,1.7 ecc.h,1.2,1.3 fat.c,1.6,1.7 id3.c,1.4,1.5 id3.h,1.2,1.3 io.c,1.12,1.13 io.h,1.4,1.5 mmc.c,1.1,1.2 mpio.c,1.17,1.18 smartmedia.c,1.9,1.10 smartmedia.h,1.3,1.4

[Markus G. <ger...@us...>]

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

Modified Files:
	cis.h directory.c directory.h ecc.c ecc.h fat.c id3.c id3.h 
	io.c io.h mmc.c mpio.c smartmedia.c smartmedia.h 
Log Message:
       * changed version to 0.7.1-pre3
       * (hopefully) fixed signedness hell,
          should fix problems with 64 bit machines



Index: id3.h
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/id3.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** id3.h	27 Apr 2003 12:08:21 -0000	1.2
--- id3.h	21 Jan 2006 18:33:20 -0000	1.3
***************
*** 32,36 ****
  /* ID3 rewriting: do the work */
  /* context, src filename, uniq filename template */
! int    mpio_id3_do(mpio_t *, BYTE *, BYTE *);  
  
  /* ID3: clean up temp file */
--- 32,36 ----
  /* ID3 rewriting: do the work */
  /* context, src filename, uniq filename template */
! int    mpio_id3_do(mpio_t *, CHAR *, CHAR *);  
  
  /* ID3: clean up temp file */

Index: smartmedia.h
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/smartmedia.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** smartmedia.h	24 Jul 2003 16:17:30 -0000	1.3
--- smartmedia.h	21 Jan 2006 18:33:20 -0000	1.4
***************
*** 32,36 ****
  /* get our configuration for SmartMedia cards right */
  int	mpio_id2mem (BYTE);
! BYTE *	mpio_id2manufacturer(BYTE);
  void	mpio_id2geo(BYTE, mpio_disk_phy_t *);
  BYTE	mpio_id_valid(BYTE);
--- 32,36 ----
  /* get our configuration for SmartMedia cards right */
  int	mpio_id2mem (BYTE);
! CHAR *	mpio_id2manufacturer(BYTE);
  void	mpio_id2geo(BYTE, mpio_disk_phy_t *);
  BYTE	mpio_id_valid(BYTE);

Index: mpio.c
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/mpio.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** mpio.c	31 May 2004 09:28:50 -0000	1.17
--- mpio.c	21 Jan 2006 18:33:20 -0000	1.18
***************
*** 49,58 ****
  
  int mpio_file_get_real(mpio_t *, mpio_mem_t, mpio_filename_t, mpio_filename_t,
! 		       mpio_callback_t, BYTE **); 
  
  int mpio_file_put_real(mpio_t *, mpio_mem_t, mpio_filename_t, mpio_filename_t,
! 		       mpio_filetype_t, mpio_callback_t, BYTE *, int);
  
! static BYTE *mpio_model_name[] = {
    "MPIO-DME",
    "MPIO-DMG",
--- 49,58 ----
  
  int mpio_file_get_real(mpio_t *, mpio_mem_t, mpio_filename_t, mpio_filename_t,
! 		       mpio_callback_t, CHAR **); 
  
  int mpio_file_put_real(mpio_t *, mpio_mem_t, mpio_filename_t, mpio_filename_t,
! 		       mpio_filetype_t, mpio_callback_t, CHAR *, int);
  
! static CHAR *mpio_model_name[] = {
    "MPIO-DME",
    "MPIO-DMG",
***************
*** 142,146 ****
  mpio_check_filename(mpio_filename_t filename)
  {
!   BYTE *p=filename;
    
    while (p < (filename + MPIO_FILENAME_LEN))
--- 142,146 ----
  mpio_check_filename(mpio_filename_t filename)
  {
!   CHAR *p=filename;
    
    while (p < (filename + MPIO_FILENAME_LEN))
***************
*** 453,457 ****
        sm = &new_mpio->external;  
        mpio_io_spare_read(new_mpio, MPIO_EXTERNAL_MEM, 0,
! 			 sm->size, 0, sm->spare,
  			 (sm->max_blocks * 0x10), progress_callback);
        mpio_zone_init(new_mpio, MPIO_EXTERNAL_MEM);
--- 453,457 ----
        sm = &new_mpio->external;  
        mpio_io_spare_read(new_mpio, MPIO_EXTERNAL_MEM, 0,
! 			 sm->size, 0, (CHAR *)sm->spare,
  			 (sm->max_blocks * 0x10), progress_callback);
        mpio_zone_init(new_mpio, MPIO_EXTERNAL_MEM);
***************
*** 484,488 ****
   */
  int
! mpio_memory_free(mpio_t *m, mpio_mem_t mem, int *free)
  {
    if (mem==MPIO_INTERNAL_MEM) {    
--- 484,488 ----
   */
  int
! mpio_memory_free(mpio_t *m, mpio_mem_t mem, DWORD *free)
  {
    if (mem==MPIO_INTERNAL_MEM) {    
***************
*** 606,610 ****
  int
  mpio_file_get_to_memory(mpio_t *m, mpio_mem_t mem, mpio_filename_t filename, 
! 			mpio_callback_t progress_callback, BYTE **memory)
  {
    return mpio_file_get_real(m, mem, filename, NULL, progress_callback, memory);
--- 606,610 ----
  int
  mpio_file_get_to_memory(mpio_t *m, mpio_mem_t mem, mpio_filename_t filename, 
! 			mpio_callback_t progress_callback, CHAR **memory)
  {
    return mpio_file_get_real(m, mem, filename, NULL, progress_callback, memory);
***************
*** 614,618 ****
  mpio_file_get_real(mpio_t *m, mpio_mem_t mem, mpio_filename_t filename,
  		   mpio_filename_t as, mpio_callback_t progress_callback,
! 		   BYTE **memory)
  {
    mpio_smartmedia_t *sm;
--- 614,618 ----
  mpio_file_get_real(mpio_t *m, mpio_mem_t mem, mpio_filename_t filename,
  		   mpio_filename_t as, mpio_callback_t progress_callback,
! 		   CHAR **memory)
  {
    mpio_smartmedia_t *sm;
***************
*** 741,745 ****
  			  mpio_filetype_t filetype,
  			  mpio_callback_t progress_callback,
! 			  BYTE *memory, int memory_size)
  {
    return mpio_file_put_real(m, mem, filename,  NULL, filetype,
--- 741,745 ----
  			  mpio_filetype_t filetype,
  			  mpio_callback_t progress_callback,
! 			  CHAR *memory, int memory_size)
  {
    return mpio_file_put_real(m, mem, filename,  NULL, filetype,
***************
*** 751,755 ****
  		   mpio_filename_t o_filename, mpio_filetype_t filetype,
  		   mpio_callback_t progress_callback,
! 		   BYTE *memory, int memory_size)
  {
    mpio_smartmedia_t *sm;
--- 751,755 ----
  		   mpio_filename_t o_filename, mpio_filetype_t filetype,
  		   mpio_callback_t progress_callback,
! 		   CHAR *memory, int memory_size)
  {
    mpio_smartmedia_t *sm;
***************
*** 757,761 ****
    WORD start;
    BYTE block[MEGABLOCK_SIZE];
!   BYTE use_filename[INFO_LINE];
    int fd, toread;
    struct stat file_stat;
--- 757,761 ----
    WORD start;
    BYTE block[MEGABLOCK_SIZE];
!   CHAR use_filename[INFO_LINE];
    int fd, toread;
    struct stat file_stat;
***************
*** 1081,1085 ****
    BYTE abort = 0;
    BYTE *cis, *mbr, *pbr;
!   BYTE defect[SECTOR_SIZE];
    int i;
  
--- 1081,1085 ----
    BYTE abort = 0;
    BYTE *cis, *mbr, *pbr;
!   CHAR defect[SECTOR_SIZE];
    int i;
  
***************
*** 1166,1177 ****
      /*     mpio_io_block_delete(m, mem, f); */
      free(f);
!     cis = (BYTE *)mpio_cis_gen(); /* hmm, why this cast? */
!     mpio_io_sector_write(m, mem, MPIO_BLOCK_CIS,   cis);
!     mpio_io_sector_write(m, mem, MPIO_BLOCK_CIS+1, cis);    
      free(cis);
  
      /* generate boot blocks ... */
!     mbr = (BYTE *)mpio_mbr_gen(m->external.size);
!     pbr = (BYTE *)mpio_pbr_gen(m->external.size);
      /* ... copy the blocks to internal memory structurs ... */
      memcpy(sm->cis, cis, SECTOR_SIZE);
--- 1166,1177 ----
      /*     mpio_io_block_delete(m, mem, f); */
      free(f);
!     cis = mpio_cis_gen(); 
!     mpio_io_sector_write(m, mem, MPIO_BLOCK_CIS,   (CHAR *)cis);
!     mpio_io_sector_write(m, mem, MPIO_BLOCK_CIS+1, (CHAR *)cis);    
      free(cis);
  
      /* generate boot blocks ... */
!     mbr = mpio_mbr_gen(m->external.size);
!     pbr = mpio_pbr_gen(m->external.size);
      /* ... copy the blocks to internal memory structurs ... */
      memcpy(sm->cis, cis, SECTOR_SIZE);
***************
*** 1412,1417 ****
  	return 0;
  
!       hexdump(m->internal.fat, m->internal.max_blocks*0x10);
!       hexdump(m->internal.root->dir, DIR_SIZE);
        if (m->internal.version) {
  	/* new chip */
--- 1412,1417 ----
  	return 0;
  
!       hexdump((CHAR *)m->internal.fat, m->internal.max_blocks*0x10);
!       hexdump((CHAR *)m->internal.root->dir, DIR_SIZE);
        if (m->internal.version) {
  	/* new chip */
***************
*** 1426,1430 ****
  	/* old chip */ 
          for (i = 0 ; i<=0x100 ; i++) 
! 	  mpio_io_sector_read(m, mem, i, block);
        }      
  
--- 1426,1430 ----
  	/* old chip */ 
          for (i = 0 ; i<=0x100 ; i++) 
! 	  mpio_io_sector_read(m, mem, i, (CHAR *)block);
        }      
  
***************
*** 1436,1444 ****
  	return 0;
  
!       hexdump(m->external.spare, m->external.max_blocks*0x10);
!       hexdump(m->external.fat,   m->external.fat_size*SECTOR_SIZE);
!       hexdump(m->external.root->dir, DIR_SIZE);
        for (i = 0 ; i<=0x100 ; i++) 
! 	mpio_io_sector_read(m, mem, i, block);
      }
    
--- 1436,1444 ----
  	return 0;
  
!       hexdump((CHAR *)m->external.spare, m->external.max_blocks*0x10);
!       hexdump((CHAR *)m->external.fat,   m->external.fat_size*SECTOR_SIZE);
!       hexdump((CHAR *)m->external.root->dir, DIR_SIZE);
        for (i = 0 ; i<=0x100 ; i++) 
! 	mpio_io_sector_read(m, mem, i, (CHAR *)block);
      }
    

Index: id3.c
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/id3.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** id3.c	12 Jun 2003 08:32:33 -0000	1.4
--- id3.c	21 Jan 2006 18:33:20 -0000	1.5
***************
*** 34,39 ****
  #ifdef MPLIB
  /* local declarations */
! void mpio_id3_get_content(id3_tag *, id3_tag *, int, BYTE[INFO_LINE]);
! void mpio_id3_copy_tag(BYTE *, BYTE *, int *);
  BYTE mpio_id3_get(mpio_t *);
  BYTE mpio_id3_set(mpio_t *, BYTE);
--- 34,39 ----
  #ifdef MPLIB
  /* local declarations */
! void mpio_id3_get_content(id3_tag *, id3_tag *, int, CHAR[INFO_LINE]);
! void mpio_id3_copy_tag(CHAR *, CHAR *, int *);
  BYTE mpio_id3_get(mpio_t *);
  BYTE mpio_id3_set(mpio_t *, BYTE);
***************
*** 41,45 ****
  void
  mpio_id3_get_content(id3_tag *tag, id3_tag *tag2, int field, 
! 		       BYTE out[INFO_LINE])
  {
    id3_content  *content;
--- 41,45 ----
  void
  mpio_id3_get_content(id3_tag *tag, id3_tag *tag2, int field, 
! 		       CHAR out[INFO_LINE])
  {
    id3_content  *content;
***************
*** 61,65 ****
  
  void
! mpio_id3_copy_tag(BYTE *src, BYTE *dest, int *offset)
  {
    int i=0;
--- 61,65 ----
  
  void
! mpio_id3_copy_tag(CHAR *src, CHAR *dest, int *offset)
  {
    int i=0;
***************
*** 104,108 ****
  /* context, src filename, uniq filename template */
  int    
! mpio_id3_do(mpio_t *m, BYTE *src, BYTE *tmp)
  {
  #ifdef MPLIB
--- 104,108 ----
  /* context, src filename, uniq filename template */
  int    
! mpio_id3_do(mpio_t *m, CHAR *src, CHAR *tmp)
  {
  #ifdef MPLIB
***************
*** 116,132 ****
    id3_content    new_content;
    id3v2_tag *v2_tag;  
!   BYTE data_artist[INFO_LINE];
!   BYTE data_title[INFO_LINE];
!   BYTE data_album[INFO_LINE];
!   BYTE data_year[INFO_LINE];
!   BYTE data_genre[INFO_LINE];
!   BYTE data_comment[INFO_LINE];
!   BYTE data_track[INFO_LINE];
  
!   BYTE mpio_tag[INFO_LINE];
    char   *mpio_tag_unicode; 
  
    iconv_t ic;
!   int fin, fout;
    char *fback, *back;
  
--- 116,132 ----
    id3_content    new_content;
    id3v2_tag *v2_tag;  
!   CHAR data_artist[INFO_LINE];
!   CHAR data_title[INFO_LINE];
!   CHAR data_album[INFO_LINE];
!   CHAR data_year[INFO_LINE];
!   CHAR data_genre[INFO_LINE];
!   CHAR data_comment[INFO_LINE];
!   CHAR data_track[INFO_LINE];
  
!   CHAR mpio_tag[INFO_LINE];
    char   *mpio_tag_unicode; 
  
    iconv_t ic;
!   size_t fin, fout;
    char *fback, *back;
  
***************
*** 286,290 ****
  
  void   
! mpio_id3_format_set(mpio_t *m, BYTE *format)
  {
    strncpy(m->id3_format, format, INFO_LINE);
--- 286,290 ----
  
  void   
! mpio_id3_format_set(mpio_t *m, CHAR *format)
  {
    strncpy(m->id3_format, format, INFO_LINE);
***************
*** 293,297 ****
  /* get format string for rewriting*/
  void
! mpio_id3_format_get(mpio_t *m, BYTE *format)
  {
    strncpy(format, m->id3_format, INFO_LINE);
--- 293,297 ----
  /* get format string for rewriting*/
  void
! mpio_id3_format_get(mpio_t *m, CHAR *format)
  {
    strncpy(format, m->id3_format, INFO_LINE);

Index: smartmedia.c
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/smartmedia.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** smartmedia.c	19 Apr 2004 12:19:26 -0000	1.9
--- smartmedia.c	21 Jan 2006 18:33:20 -0000	1.10
***************
*** 87,94 ****
  }      
  
! BYTE *
  mpio_id2manufacturer(BYTE id)
  {
!   BYTE *m;
    switch(id) 
      {
--- 87,94 ----
  }      
  
! CHAR *
  mpio_id2manufacturer(BYTE id)
  {
!   CHAR *m;
    switch(id) 
      {

Index: mmc.c
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/mmc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mmc.c	30 May 2004 16:28:52 -0000	1.1
--- mmc.c	21 Jan 2006 18:33:20 -0000	1.2
***************
*** 51,61 ****
    /*looking for likely markers*/
    /*
!     if((m->version[0x28] == 0x32) && (m->version[0x3a] == 0x01) && (m->version[0x3b] == 0x01) && 
!     (m->version[0x30] == 0xff) && (m->version[0x31] == 0xcf))
    */   
!   if((m->version[0x39] == 0x01) && (m->version[0x3b] == 0x01) && (m->version[0x20] == 0xff) && (m->version[0x21] == 0xff) &&
!      (m->version[0x22] == 0xff) && (m->version[0x23] == 0xff) && (m->version[0x24] == 0xff) && (m->version[0x25] == 0xff))
      {
!       switch(m->version[0x26])
  	{
  	case 0x0e:    /* 16 Mb */
--- 51,70 ----
    /*looking for likely markers*/
    /*
!     if(((BYTE)(m->version[0x28]) == 0x32) && 
!     ((BYTE)(m->version[0x3a]) == 0x01) && 
!     ((BYTE)(m->version[0x3b]) == 0x01) && 
!     ((BYTE)(m->version[0x30]) == 0xff) && 
!     ((BYTE)(m->version[0x31]) == 0xcf))
    */   
!   if(((BYTE)(m->version[0x39]) == 0x01) && 
!      ((BYTE)(m->version[0x3b]) == 0x01) && 
!      ((BYTE)(m->version[0x20]) == 0xff) && 
!      ((BYTE)(m->version[0x21]) == 0xff) &&
!      ((BYTE)(m->version[0x22]) == 0xff) && 
!      ((BYTE)(m->version[0x23]) == 0xff) && 
!      ((BYTE)(m->version[0x24]) == 0xff) && 
!      ((BYTE)(m->version[0x25]) == 0xff))
      {
!       switch((BYTE)m->version[0x26])
  	{
  	case 0x0e:    /* 16 Mb */

Index: cis.h
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/cis.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cis.h	27 Apr 2003 12:08:21 -0000	1.3
--- cis.h	21 Jan 2006 18:33:20 -0000	1.4
***************
*** 24,27 ****
--- 24,29 ----
  #define _MPIO_CIS_H_
  
+ #include "string.h"
+ 
  #include "defs.h"
  

Index: io.c
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/io.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** io.c	24 Apr 2004 16:09:58 -0000	1.12
--- io.c	21 Jan 2006 18:33:20 -0000	1.13
***************
*** 135,139 ****
      {	  
        debug("error: different block addresses found:\n");
!       hexdumpn(1, entry, 0x10);
        return MPIO_BLOCK_DEFECT;
      } 
--- 135,139 ----
      {	  
        debug("error: different block addresses found:\n");
!       hexdumpn(1, (CHAR *)entry, 0x10);
        return MPIO_BLOCK_DEFECT;
      } 
***************
*** 178,183 ****
      {
        sm       = &f->m->internal;
!       /*       hexdump((char *)&f->entry, 4); */
!       /*       hexdump((char *)&f->hw_address, 4); */
        *chip    = f->hw_address / 0x1000000;    
        *address = f->hw_address & 0x0ffffff;
--- 178,183 ----
      {
        sm       = &f->m->internal;
!       /*       hexdump((CHAR *)&f->entry, 4); */
!       /*       hexdump((CHAR *)&f->hw_address, 4); */
        *chip    = f->hw_address / 0x1000000;    
        *address = f->hw_address & 0x0ffffff;
***************
*** 220,224 ****
        sm->zonetable[zone][block]=blockaddress_decode(sm->spare+e);
        
!       hexdumpn(4, sm->spare+e, 0x10);
        debugn(2, "decoded: %04x\n", sm->zonetable[zone][block]);
      }
--- 220,224 ----
        sm->zonetable[zone][block]=blockaddress_decode(sm->spare+e);
        
!       hexdumpn(4, (CHAR *)sm->spare+e, 0x10);
        debugn(2, "decoded: %04x\n", sm->zonetable[zone][block]);
      }
***************
*** 637,641 ****
  int
  mpio_io_set_cmdpacket(mpio_t *m, mpio_cmd_t cmd, mpio_mem_t mem, DWORD index,
! 		      WORD size, BYTE wsize, BYTE *buffer) 
  {
    BYTE memory;
--- 637,641 ----
  int
  mpio_io_set_cmdpacket(mpio_t *m, mpio_cmd_t cmd, mpio_mem_t mem, DWORD index,
! 		      WORD size, BYTE wsize, CHAR *buffer) 
  {
    BYTE memory;
***************
*** 681,687 ****
   */
  int
! mpio_io_bulk_write(int fd, BYTE *block, int num_bytes)
  {
!   BYTE *p;
    int count, bytes_left, bytes_written;
  
--- 681,687 ----
   */
  int
! mpio_io_bulk_write(int fd, CHAR *block, int num_bytes)
  {
!   CHAR *p;
    int count, bytes_left, bytes_written;
  
***************
*** 705,709 ****
  
  int
! mpio_io_write(mpio_t *m, BYTE *block, int num_bytes)
  {
    if (m->use_libusb) {
--- 705,709 ----
  
  int
! mpio_io_write(mpio_t *m, CHAR *block, int num_bytes)
  {
    if (m->use_libusb) {
***************
*** 733,740 ****
   */
  int
! mpio_io_bulk_read (int fd, BYTE *block, int num_bytes)
  {
    int total_read, count, bytes_left;
!   BYTE *p;
  
    total_read = 0;
--- 733,740 ----
   */
  int
! mpio_io_bulk_read (int fd, CHAR *block, int num_bytes)
  {
    int total_read, count, bytes_left;
!   CHAR *p;
  
    total_read = 0;
***************
*** 758,762 ****
  
  int
! mpio_io_read (mpio_t *m, BYTE *block, int num_bytes)
  {
    if (m->use_libusb) {
--- 758,762 ----
  
  int
! mpio_io_read (mpio_t *m, CHAR *block, int num_bytes)
  {
    if (m->use_libusb) {
***************
*** 789,796 ****
   */
  int
! mpio_io_version_read(mpio_t *m, BYTE *buffer)
  {
    int nwrite, nread;
!   BYTE cmdpacket[CMD_SIZE], status[CMD_SIZE];
  
    /*  Send command packet to MPIO  */
--- 789,796 ----
   */
  int
! mpio_io_version_read(mpio_t *m, CHAR *buffer)
  {
    int nwrite, nread;
!   CHAR cmdpacket[CMD_SIZE], status[CMD_SIZE];
  
    /*  Send command packet to MPIO  */
***************
*** 844,853 ****
  
  int
! mpio_io_sector_read(mpio_t *m, BYTE mem, DWORD index, BYTE *output)
  {
    mpio_smartmedia_t *sm=0;
    DWORD sector;
    int nwrite, nread;
!   BYTE cmdpacket[CMD_SIZE], recvbuff[SECTOR_TRANS];
  
    if (mem == MPIO_INTERNAL_MEM) sm = &m->internal;
--- 844,853 ----
  
  int
! mpio_io_sector_read(mpio_t *m, BYTE mem, DWORD index, CHAR *output)
  {
    mpio_smartmedia_t *sm=0;
    DWORD sector;
    int nwrite, nread;
!   CHAR cmdpacket[CMD_SIZE], recvbuff[SECTOR_TRANS];
  
    if (mem == MPIO_INTERNAL_MEM) sm = &m->internal;
***************
*** 945,949 ****
  
  int  
! mpio_io_sector_write(mpio_t *m, BYTE mem, DWORD index, BYTE *input)
  {
    int nwrite;
--- 945,949 ----
  
  int  
! mpio_io_sector_write(mpio_t *m, BYTE mem, DWORD index, CHAR *input)
  {
    int nwrite;
***************
*** 951,955 ****
    DWORD pvalue;
    DWORD block_address, ba;
!   BYTE cmdpacket[CMD_SIZE], sendbuff[SECTOR_TRANS];
  
    if (mem == MPIO_INTERNAL_MEM) sm = &m->internal;
--- 951,955 ----
    DWORD pvalue;
    DWORD block_address, ba;
!   CHAR cmdpacket[CMD_SIZE], sendbuff[SECTOR_TRANS];
  
    if (mem == MPIO_INTERNAL_MEM) sm = &m->internal;
***************
*** 1097,1101 ****
    BYTE  chip;
    DWORD address;
!   BYTE cmdpacket[CMD_SIZE], recvbuff[BLOCK_TRANS];
  
    if (mem == MPIO_INTERNAL_MEM) sm = &m->internal;
--- 1097,1101 ----
    BYTE  chip;
    DWORD address;
!   CHAR cmdpacket[CMD_SIZE], recvbuff[BLOCK_TRANS];
  
    if (mem == MPIO_INTERNAL_MEM) sm = &m->internal;
***************
*** 1156,1160 ****
    BYTE  chip;
    DWORD address;
!   BYTE cmdpacket[CMD_SIZE], recvbuff[BLOCK_TRANS];
  
    if (mem == MPIO_INTERNAL_MEM) sm = &m->internal;
--- 1156,1160 ----
    BYTE  chip;
    DWORD address;
!   CHAR cmdpacket[CMD_SIZE], recvbuff[BLOCK_TRANS];
  
    if (mem == MPIO_INTERNAL_MEM) sm = &m->internal;
***************
*** 1227,1231 ****
  int
  mpio_io_spare_read(mpio_t *m, BYTE mem, DWORD index, WORD size,
! 		   BYTE wsize, BYTE *output, int toread,
  		   mpio_callback_init_t progress_callback)
  {
--- 1227,1231 ----
  int
  mpio_io_spare_read(mpio_t *m, BYTE mem, DWORD index, WORD size,
! 		   BYTE wsize, CHAR *output, int toread,
  		   mpio_callback_init_t progress_callback)
  {
***************
*** 1235,1239 ****
    int chip = 0;
    int chips = 0;
!   BYTE cmdpacket[CMD_SIZE];
  
    if (mem == MPIO_INTERNAL_MEM) sm = &m->internal;  
--- 1235,1239 ----
    int chip = 0;
    int chips = 0;
!   CHAR cmdpacket[CMD_SIZE];
  
    if (mem == MPIO_INTERNAL_MEM) sm = &m->internal;  
***************
*** 1318,1322 ****
    mpio_smartmedia_t *sm;
    int nwrite, nread;
!   BYTE cmdpacket[CMD_SIZE], status[CMD_SIZE];
    BYTE CMD_OK, CMD_ERROR;
    
--- 1318,1323 ----
    mpio_smartmedia_t *sm;
    int nwrite, nread;
!   CHAR cmdpacket[CMD_SIZE];
!   BYTE status[CMD_SIZE];
    BYTE CMD_OK, CMD_ERROR;
    
***************
*** 1347,1351 ****
  
    debugn  (5, ">>> MPIO\n");
!   hexdump (cmdpacket, sizeof(cmdpacket));
  
    nwrite = mpio_io_write(m, cmdpacket, 0x40);
--- 1348,1352 ----
  
    debugn  (5, ">>> MPIO\n");
!   hexdump ((CHAR *)cmdpacket, sizeof(cmdpacket));
  
    nwrite = mpio_io_write(m, cmdpacket, 0x40);
***************
*** 1369,1373 ****
  
    debugn(5, "<<< MPIO\n");
!   hexdump(status, CMD_SIZE);
  
    if (status[0] != CMD_OK) 
--- 1370,1374 ----
  
    debugn(5, "<<< MPIO\n");
!   hexdump((CHAR *)status, CMD_SIZE);
  
    if (status[0] != CMD_OK) 
***************
*** 1399,1403 ****
    int i, j, k;
    DWORD block_address, ba;
!   BYTE cmdpacket[CMD_SIZE], sendbuff[MEGABLOCK_TRANS_WRITE];
    BYTE  chip=0;
    DWORD address;
--- 1400,1404 ----
    int i, j, k;
    DWORD block_address, ba;
!   CHAR cmdpacket[CMD_SIZE], sendbuff[MEGABLOCK_TRANS_WRITE];
    BYTE  chip=0;
    DWORD address;
***************
*** 1421,1425 ****
    debugn(5, "\n>>> MPIO\n");
    hexdump(cmdpacket, sizeof(cmdpacket));
!   hexdump(f->i_fat, 0x10);
  
    nwrite = mpio_io_write(m, cmdpacket, CMD_SIZE);
--- 1422,1426 ----
    debugn(5, "\n>>> MPIO\n");
    hexdump(cmdpacket, sizeof(cmdpacket));
!   hexdump((CHAR *)f->i_fat, 0x10);
  
    nwrite = mpio_io_write(m, cmdpacket, CMD_SIZE);
***************
*** 1472,1476 ****
    int i;
    DWORD block_address, ba;
!   BYTE cmdpacket[CMD_SIZE], sendbuff[BLOCK_TRANS];
    BYTE  chip=0;
    DWORD address;
--- 1473,1477 ----
    int i;
    DWORD block_address, ba;
!   CHAR cmdpacket[CMD_SIZE], sendbuff[BLOCK_TRANS];
    BYTE  chip=0;
    DWORD address;

Index: directory.h
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/directory.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** directory.h	19 Oct 2003 21:06:35 -0000	1.4
--- directory.h	21 Jan 2006 18:33:20 -0000	1.5
***************
*** 46,54 ****
  int	mpio_dentry_get_size(mpio_t *, mpio_mem_t, BYTE *);
  int	mpio_dentry_get_raw(mpio_t *, mpio_mem_t, BYTE *, BYTE *, int);
! int	mpio_dentry_put(mpio_t *, mpio_mem_t, BYTE *, int,
  			time_t, DWORD, WORD, BYTE);
! BYTE *	mpio_dentry_find_name_8_3(mpio_t *, BYTE, BYTE *);
! BYTE *	mpio_dentry_find_name(mpio_t *, BYTE, BYTE *);
! int	mpio_dentry_delete(mpio_t *, BYTE, BYTE *);
  int     mpio_dentry_get_filesize(mpio_t *, mpio_mem_t, BYTE *);
  BYTE    mpio_dentry_get_attrib(mpio_t *, mpio_mem_t, BYTE *);
--- 46,54 ----
  int	mpio_dentry_get_size(mpio_t *, mpio_mem_t, BYTE *);
  int	mpio_dentry_get_raw(mpio_t *, mpio_mem_t, BYTE *, BYTE *, int);
! int	mpio_dentry_put(mpio_t *, mpio_mem_t, CHAR *, int,
  			time_t, DWORD, WORD, BYTE);
! BYTE *	mpio_dentry_find_name_8_3(mpio_t *, BYTE, CHAR *);
! BYTE *	mpio_dentry_find_name(mpio_t *, BYTE, CHAR *);
! int	mpio_dentry_delete(mpio_t *, BYTE, CHAR *);
  int     mpio_dentry_get_filesize(mpio_t *, mpio_mem_t, BYTE *);
  BYTE    mpio_dentry_get_attrib(mpio_t *, mpio_mem_t, BYTE *);
***************
*** 61,65 ****
  
  /* rename a dentry */
! void    mpio_dentry_rename(mpio_t *, mpio_mem_t, BYTE *, BYTE *);
  
  /* Move a given file to a new position in the file
--- 61,65 ----
  
  /* rename a dentry */
! void    mpio_dentry_rename(mpio_t *, mpio_mem_t, BYTE *, CHAR *);
  
  /* Move a given file to a new position in the file
***************
*** 69,80 ****
  
  /* helper functions */
! void    mpio_dentry_copy_from_slot(BYTE *, mpio_dir_slot_t *);
! void    mpio_dentry_copy_to_slot(BYTE *, mpio_dir_slot_t *);
! int	mpio_dentry_get_real(mpio_t *, mpio_mem_t, BYTE *, BYTE *, 
! 			     int, BYTE[12],
  			     WORD *, BYTE *, BYTE *, BYTE *, BYTE *, DWORD *,
  			     BYTE *);
  mpio_dir_entry_t *
!   mpio_dentry_filename_write(mpio_t *, mpio_mem_t, BYTE *, BYTE *, int);
  
  #ifdef __cplusplus
--- 69,80 ----
  
  /* helper functions */
! void    mpio_dentry_copy_from_slot(CHAR *, mpio_dir_slot_t *);
! void    mpio_dentry_copy_to_slot(CHAR *, mpio_dir_slot_t *);
! int	mpio_dentry_get_real(mpio_t *, mpio_mem_t, BYTE *, CHAR *, 
! 			     int, CHAR[12],
  			     WORD *, BYTE *, BYTE *, BYTE *, BYTE *, DWORD *,
  			     BYTE *);
  mpio_dir_entry_t *
!   mpio_dentry_filename_write(mpio_t *, mpio_mem_t, BYTE *, CHAR *, int);
  
  #ifdef __cplusplus

Index: ecc.c
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/ecc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ecc.c	12 Jun 2003 08:32:33 -0000	1.6
--- ecc.c	21 Jan 2006 18:33:20 -0000	1.7
***************
*** 32,50 ****
  
  int 
! mpio_ecc_256_gen(BYTE *data, BYTE *ecc)
  {
!   BYTE p1, p1_;
!   BYTE p2, p2_;
!   BYTE p4, p4_;
  
!   BYTE p08, p08_;
!   BYTE p16, p16_;
!   BYTE p32, p32_;
!   BYTE p64, p64_;
  
!   BYTE p0128, p0128_;
!   BYTE p0256, p0256_;
!   BYTE p0512, p0512_;
!   BYTE p1024, p1024_;
  
    int i, j;
--- 32,50 ----
  
  int 
! mpio_ecc_256_gen(CHAR *data, CHAR *ecc)
  {
!   CHAR p1, p1_;
!   CHAR p2, p2_;
!   CHAR p4, p4_;
  
!   CHAR p08, p08_;
!   CHAR p16, p16_;
!   CHAR p32, p32_;
!   CHAR p64, p64_;
  
!   CHAR p0128, p0128_;
!   CHAR p0256, p0256_;
!   CHAR p0512, p0512_;
!   CHAR p1024, p1024_;
  
    int i, j;
***************
*** 129,137 ****
  
  int
! mpio_ecc_256_check(BYTE *data, BYTE *ecc)
  {
!   BYTE own_ecc[3];
!   BYTE check[3];
!   BYTE line, col;
    
    int v, i;
--- 129,137 ----
  
  int
! mpio_ecc_256_check(CHAR *data, CHAR *ecc)
  {
!   CHAR own_ecc[3];
!   CHAR check[3];
!   CHAR line, col;
    
    int v, i;

Index: io.h
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/io.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** io.h	19 Oct 2003 21:06:35 -0000	1.4
--- io.h	21 Jan 2006 18:33:20 -0000	1.5
***************
*** 68,82 ****
  /* real I/O */
  int	mpio_io_set_cmdpacket(mpio_t *, mpio_cmd_t, mpio_mem_t, 
! 			      DWORD, WORD, BYTE, BYTE *);
  
! int	mpio_io_bulk_read (int, BYTE *, int);
! int	mpio_io_bulk_write(int, BYTE *, int);
  
  /* read version block into memory */
! int	mpio_io_version_read(mpio_t *, BYTE *);
  
  /* */
! int	mpio_io_sector_read (mpio_t *, BYTE, DWORD, BYTE *);
! int	mpio_io_sector_write(mpio_t *, BYTE, DWORD, BYTE *);
  
  /* */
--- 68,82 ----
  /* real I/O */
  int	mpio_io_set_cmdpacket(mpio_t *, mpio_cmd_t, mpio_mem_t, 
! 			      DWORD, WORD, BYTE, CHAR *);
  
! int	mpio_io_bulk_read (int, CHAR *, int);
! int	mpio_io_bulk_write(int, CHAR *, int);
  
  /* read version block into memory */
! int	mpio_io_version_read(mpio_t *, CHAR *);
  
  /* */
! int	mpio_io_sector_read (mpio_t *, BYTE, DWORD, CHAR *);
! int	mpio_io_sector_write(mpio_t *, BYTE, DWORD, CHAR *);
  
  /* */
***************
*** 93,97 ****
  
  /* */
! int	mpio_io_spare_read  (mpio_t *, BYTE, DWORD, WORD, BYTE, BYTE *, int,
  			     mpio_callback_init_t);
  
--- 93,97 ----
  
  /* */
! int	mpio_io_spare_read  (mpio_t *, BYTE, DWORD, WORD, BYTE, CHAR *, int,
  			     mpio_callback_init_t);
  

Index: ecc.h
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/ecc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ecc.h	27 Apr 2003 12:08:21 -0000	1.2
--- ecc.h	21 Jan 2006 18:33:20 -0000	1.3
***************
*** 31,37 ****
  
  /* 256 Bytes Data, 3 Byte ECC to generate */
! int	mpio_ecc_256_gen(BYTE *, BYTE *);
  /* 256 Bytes Data, 3 Bytes ECC to check and possibly correct */
! int	mpio_ecc_256_check(BYTE *, BYTE*);
  
  #ifdef __cplusplus
--- 31,37 ----
  
  /* 256 Bytes Data, 3 Byte ECC to generate */
! int	mpio_ecc_256_gen(CHAR *, CHAR *);
  /* 256 Bytes Data, 3 Bytes ECC to check and possibly correct */
! int	mpio_ecc_256_check(CHAR *, CHAR*);
  
  #ifdef __cplusplus

Index: fat.c
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/fat.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fat.c	30 May 2004 16:28:52 -0000	1.6
--- fat.c	21 Jan 2006 18:33:20 -0000	1.7
***************
*** 147,153 ****
    /* FAT id */
    if (size >=128) {
!     strcpy(p+0x36, "FAT16");
    } else {
!     strcpy(p+0x36, "FAT12");
    }
    
--- 147,153 ----
    /* FAT id */
    if (size >=128) {
!     strcpy((CHAR *)(p+0x36), "FAT16");
    } else {
!     strcpy((CHAR *)(p+0x36), "FAT12");
    }
    
***************
*** 196,200 ****
      }
    
!   if (strncmp((sm->pbr+0x36),"FAT", 3) != 0) 
      {
        debug("Did not find an FAT signature, *not* good!\n");
--- 196,200 ----
      }
    
!   if (strncmp((CHAR *)(sm->pbr+0x36),"FAT", 3) != 0) 
      {
        debug("Did not find an FAT signature, *not* good!\n");
***************
*** 323,327 ****
  
    /* read CIS (just in case it might me usefull) */
!   if (mpio_io_sector_read(m, mem, MPIO_BLOCK_CIS, sm->cis)) 
      {
        debug("error reading CIS\n");    
--- 323,327 ----
  
    /* read CIS (just in case it might me usefull) */
!   if (mpio_io_sector_read(m, mem, MPIO_BLOCK_CIS, (CHAR *)sm->cis)) 
      {
        debug("error reading CIS\n");    
***************
*** 331,335 ****
    /* read MBR */
    /* the MBR is always located @ logical block 0, sector 0! */
!   if (mpio_io_sector_read(m, mem, 0, sm->mbr)) 
      {
        debug("error reading MBR\n");    
--- 331,335 ----
    /* read MBR */
    /* the MBR is always located @ logical block 0, sector 0! */
!   if (mpio_io_sector_read(m, mem, 0, (CHAR *)sm->mbr)) 
      {
        debug("error reading MBR\n");    
***************
*** 345,349 ****
  
    /* read PBR */
!   if (mpio_io_sector_read(m, mem, sm->pbr_offset, sm->pbr))
      {
        debug("error reading PBR\n");    
--- 345,349 ----
  
    /* read PBR */
!   if (mpio_io_sector_read(m, mem, sm->pbr_offset, (CHAR *)sm->pbr))
      {
        debug("error reading PBR\n");    
***************
*** 429,433 ****
  {
    mpio_smartmedia_t *sm;
!   BYTE recvbuff[SECTOR_SIZE];
    DWORD i;
  
--- 429,433 ----
  {
    mpio_smartmedia_t *sm;
!   CHAR recvbuff[SECTOR_SIZE];
    DWORD i;
  
***************
*** 435,439 ****
      {    
        sm = &m->internal;
!       if (mpio_io_spare_read(m, mem, 0, sm->size, 0, sm->fat,
  			     (sm->fat_size * SECTOR_SIZE), progress_callback))
  	return 1;
--- 435,439 ----
      {    
        sm = &m->internal;
!       if (mpio_io_spare_read(m, mem, 0, sm->size, 0, (CHAR *)sm->fat,
  			     (sm->fat_size * SECTOR_SIZE), progress_callback))
  	return 1;
***************
*** 844,851 ****
  		{
  		  mpio_io_sector_write(m, mem, i, 
! 				       (sm->root->dir + SECTOR_SIZE * i));
  		} else {
  		  /* fill the rest of the block with zeros */
! 		  mpio_io_sector_write(m, mem, i, dummy);
  		}	
  	    }    
--- 844,851 ----
  		{
  		  mpio_io_sector_write(m, mem, i, 
! 				       (CHAR *)(sm->root->dir + SECTOR_SIZE * i));
  		} else {
  		  /* fill the rest of the block with zeros */
! 		mpio_io_sector_write(m, mem, i, (CHAR *)dummy);
  		}	
  	    }    
***************
*** 883,901 ****
  	/* remeber: logical sector 0 is the MBR! */
  	if (i == 0)
! 	  mpio_io_sector_write(m, mem, 0, sm->mbr);
  	if ((i > 0) && (i < sm->pbr_offset))
! 	  mpio_io_sector_write(m, mem, i, dummy);
  	
  	if (i == sm->pbr_offset)
! 	  mpio_io_sector_write(m, mem, sm->pbr_offset, sm->pbr);
  	
  	if ((i >= sm->fat_offset) && (i < (sm->fat_offset + (2*sm->fat_size)))) 
  	  mpio_io_sector_write(m, mem, i, 
! 			       (sm->fat + SECTOR_SIZE *
  				((i - sm->fat_offset) % sm->fat_size)));
  	
  	if (i>=sm->dir_offset)
  	  mpio_io_sector_write(m, mem, i, 
! 			       (sm->root->dir + 
  				(i - sm->dir_offset) * SECTOR_SIZE));
        }
--- 883,901 ----
  	/* remeber: logical sector 0 is the MBR! */
  	if (i == 0)
! 	  mpio_io_sector_write(m, mem, 0, (CHAR *)sm->mbr);
  	if ((i > 0) && (i < sm->pbr_offset))
! 	  mpio_io_sector_write(m, mem, i, (CHAR *)dummy);
  	
  	if (i == sm->pbr_offset)
! 	  mpio_io_sector_write(m, mem, sm->pbr_offset, (CHAR *)sm->pbr);
  	
  	if ((i >= sm->fat_offset) && (i < (sm->fat_offset + (2*sm->fat_size)))) 
  	  mpio_io_sector_write(m, mem, i, 
! 			       (CHAR *)(sm->fat + SECTOR_SIZE *
  				((i - sm->fat_offset) % sm->fat_size)));
  	
  	if (i>=sm->dir_offset)
  	  mpio_io_sector_write(m, mem, i, 
! 			       (CHAR *)(sm->root->dir + 
  				(i - sm->dir_offset) * SECTOR_SIZE));
        }
***************
*** 983,987 ****
  	{
  	  debug("defective block encountered, abort reading! (wrong file state marker)\n");
! 	  hexdumpn(0, (sm->fat+e), 0x10);
  	  return 1;
  	}      
--- 983,987 ----
  	{
  	  debug("defective block encountered, abort reading! (wrong file state marker)\n");
! 	  hexdumpn(0, (CHAR *)(sm->fat+e), 0x10);
  	  return 1;
  	}      

Index: directory.c
===================================================================
RCS file: /cvsroot/mpio/mpio/libmpio/src/directory.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** directory.c	23 Apr 2004 19:21:07 -0000	1.13
--- directory.c	21 Jan 2006 18:33:20 -0000	1.14
***************
*** 70,74 ****
   * charset for filename encoding/converting
   */
! BYTE *
  mpio_charset_get(mpio_t *m)
  {
--- 70,74 ----
   * charset for filename encoding/converting
   */
! CHAR *
  mpio_charset_get(mpio_t *m)
  {
***************
*** 77,81 ****
    
  BYTE   
! mpio_charset_set(mpio_t *m, BYTE *charset)
  {
    iconv_t ic;
--- 77,81 ----
    
  BYTE   
! mpio_charset_set(mpio_t *m, CHAR *charset)
  {
    iconv_t ic;
***************
*** 132,136 ****
    dentry->attr = 0x10;
  
!   hexdumpn(2, dir->dir, 64);
  
    return 0;
--- 132,136 ----
    dentry->attr = 0x10;
  
!   hexdumpn(2, (CHAR *)dir->dir, 64);
  
    return 0;
***************
*** 153,157 ****
    mpio_io_block_read(m, mem, f, dir->dir);
  
!   hexdumpn(5, dir->dir, DIR_SIZE);	
  
    return 0;
--- 153,157 ----
    mpio_io_block_read(m, mem, f, dir->dir);
  
!   hexdumpn(5, (CHAR *)dir->dir, DIR_SIZE);	
  
    return 0;
***************
*** 177,181 ****
    p = dir->dir + 0x40;
    size = mpio_dentry_get_size(m, mem, p);
!   hexdumpn(2, p, size);
    if ((p[size-0x20+0x0b] == 0x1a) &&
        (p[size] == 0x00))
--- 177,181 ----
    p = dir->dir + 0x40;
    size = mpio_dentry_get_size(m, mem, p);
!   hexdumpn(2, (CHAR *)p, size);
    if ((p[size-0x20+0x0b] == 0x1a) &&
        (p[size] == 0x00))
***************
*** 211,215 ****
        f->i_fat[0x06] = FTYPE_ENTRY;
  
!       hexdumpn(2, f->i_fat, 16);
      }
    
--- 211,215 ----
        f->i_fat[0x06] = FTYPE_ENTRY;
  
!       hexdumpn(2, (CHAR *)f->i_fat, 16);
      }
    
***************
*** 249,253 ****
  
  int     
! mpio_directory_make(mpio_t *m, mpio_mem_t mem, BYTE *dir)
  {
    mpio_smartmedia_t *sm;
--- 249,253 ----
  
  int     
! mpio_directory_make(mpio_t *m, mpio_mem_t mem, CHAR *dir)
  {
    mpio_smartmedia_t *sm;
***************
*** 303,307 ****
        f->i_fat[0x02]=0;
        f->i_fat[0x03]=1;
!       hexdumpn(2, f->i_fat, 16);
      }
  
--- 303,307 ----
        f->i_fat[0x02]=0;
        f->i_fat[0x03]=1;
!       hexdumpn(2, (CHAR *)f->i_fat, 16);
      }
  
***************
*** 351,355 ****
  
  int     
! mpio_directory_cd(mpio_t *m, mpio_mem_t mem, BYTE *dir)
  {
    mpio_smartmedia_t *sm;
--- 351,355 ----
  
  int     
! mpio_directory_cd(mpio_t *m, mpio_mem_t mem, CHAR *dir)
  {
    mpio_smartmedia_t *sm;
***************
*** 359,367 ****
    BYTE ret;
    BYTE month, day, hour, minute, type;
!   BYTE fname[100];
    WORD year;  
    DWORD fsize;
    int size;
!   BYTE pwd[INFO_LINE];
    mpio_directory_t *old, *new;
  
--- 359,367 ----
    BYTE ret;
    BYTE month, day, hour, minute, type;
!   CHAR fname[100];
    WORD year;  
    DWORD fsize;
    int size;
!   CHAR pwd[INFO_LINE];
    mpio_directory_t *old, *new;
  
***************
*** 452,456 ****
  
  void    
! mpio_directory_pwd(mpio_t *m, mpio_mem_t mem, BYTE pwd[INFO_LINE])
  {
    mpio_smartmedia_t *sm;  
--- 452,456 ----
  
  void    
! mpio_directory_pwd(mpio_t *m, mpio_mem_t mem, CHAR pwd[INFO_LINE])
  {
    mpio_smartmedia_t *sm;  
***************
*** 479,493 ****
  mpio_dir_entry_t *
  mpio_dentry_filename_write(mpio_t *m, mpio_mem_t mem, BYTE *p, 
! 			   BYTE *filename, int filename_size)
  {
!   BYTE *unicode = 0;
!   BYTE *back, *fback;
!   BYTE *fname = 0;
    iconv_t ic;
    int in = 0, out = 0;
!   int fin = 0, fout = 0;
    int count = 0;
    BYTE index;
!   BYTE f_8_3[13];
    BYTE alias_check;
    mpio_dir_slot_t  *slot;
--- 479,493 ----
  mpio_dir_entry_t *
  mpio_dentry_filename_write(mpio_t *m, mpio_mem_t mem, BYTE *p, 
! 			   CHAR *filename, int filename_size)
  {
!   CHAR *unicode = 0;
!   CHAR *back, *fback;
!   CHAR *fname = 0;
    iconv_t ic;
    int in = 0, out = 0;
!   size_t fin = 0, fout = 0;
    int count = 0;
    BYTE index;
!   CHAR f_8_3[13];
    BYTE alias_check;
    mpio_dir_slot_t  *slot;
***************
*** 698,702 ****
  
  void
! mpio_dentry_copy_from_slot(BYTE *buffer, mpio_dir_slot_t *slot)
  {
    memcpy(buffer, slot->name0_4, 10);
--- 698,702 ----
  
  void
! mpio_dentry_copy_from_slot(CHAR *buffer, mpio_dir_slot_t *slot)
  {
    memcpy(buffer, slot->name0_4, 10);
***************
*** 706,710 ****
  
  void
! mpio_dentry_copy_to_slot(BYTE *buffer, mpio_dir_slot_t *slot)
  {
    memcpy(slot->name0_4, buffer, 10);
--- 706,710 ----
  
  void
! mpio_dentry_copy_to_slot(CHAR *buffer, mpio_dir_slot_t *slot)
  {
    memcpy(slot->name0_4, buffer, 10);
***************
*** 715,723 ****
  int
  mpio_dentry_get(mpio_t *m, mpio_mem_t mem, BYTE *buffer,                   
! 		BYTE *filename, int filename_size,
  		WORD *year, BYTE *month, BYTE *day,
  		BYTE *hour, BYTE *minute, DWORD *fsize, BYTE *type)
  {
!   BYTE filename_8_3[13];
    
    return mpio_dentry_get_real(m, mem, buffer, filename, filename_size, 
--- 715,723 ----
  int
  mpio_dentry_get(mpio_t *m, mpio_mem_t mem, BYTE *buffer,                   
! 		CHAR *filename, int filename_size,
  		WORD *year, BYTE *month, BYTE *day,
  		BYTE *hour, BYTE *minute, DWORD *fsize, BYTE *type)
  {
!   CHAR filename_8_3[13];
    
    return mpio_dentry_get_real(m, mem, buffer, filename, filename_size, 
***************
*** 729,734 ****
  int
  mpio_dentry_get_real(mpio_t *m, mpio_mem_t mem, BYTE *buffer,                   
! 		     BYTE *filename, int filename_size,
! 		     BYTE *filename_8_3,
  		     WORD *year, BYTE *month, BYTE *day,
  		     BYTE *hour, BYTE *minute, DWORD *fsize,
--- 729,734 ----
  int
  mpio_dentry_get_real(mpio_t *m, mpio_mem_t mem, BYTE *buffer,                   
! 		     CHAR *filename, int filename_size,
! 		     CHAR *filename_8_3,
  		     WORD *year, BYTE *month, BYTE *day,
  		     BYTE *hour, BYTE *minute, DWORD *fsize,
***************
*** 739,749 ****
    int num_slots = 0;  
    int slots = 0;
!   int in = 0, out = 0, iconv_return;
    mpio_dir_entry_t *dentry;
    mpio_fatentry_t  *f;
    mpio_dir_slot_t  *slot;
!   BYTE *unicode = 0;
!   BYTE *uc;
!   BYTE *fname = 0;
    iconv_t ic;
    int dsize, i;
--- 739,749 ----
    int num_slots = 0;  
    int slots = 0;
!   size_t in = 0, out = 0, iconv_return;
    mpio_dir_entry_t *dentry;
    mpio_fatentry_t  *f;
    mpio_dir_slot_t  *slot;
!   CHAR *unicode = 0;
!   CHAR *uc;
!   CHAR *fname = 0;
    iconv_t ic;
    int dsize, i;
***************
*** 761,765 ****
        dsize = mpio_dentry_get_size(m, mem, buffer);
        debugn(3, "dentry size is: 0x%02x\n", dsize);
!       hexdump(buffer, dsize);
        num_slots = (dsize / 0x20) - 1;
        slots = num_slots - 1;
--- 761,765 ----
        dsize = mpio_dentry_get_size(m, mem, buffer);
        debugn(3, "dentry size is: 0x%02x\n", dsize);
!       hexdump((CHAR *)buffer, dsize);
        num_slots = (dsize / 0x20) - 1;
        slots = num_slots - 1;
***************
*** 877,881 ****
    mpio_smartmedia_t *sm;  
    mpio_fatentry_t   *f;
!   BYTE recvbuff[SECTOR_SIZE];
    int i;
  
--- 877,881 ----
    mpio_smartmedia_t *sm;  
    mpio_fatentry_t   *f;
!   CHAR recvbuff[SECTOR_SIZE];
    int i;
  
***************
*** 1061,1065 ****
  int
  mpio_dentry_put(mpio_t *m, mpio_mem_t mem,
! 		BYTE *filename, int filename_size,
  		time_t date, DWORD fsize, WORD ssector, BYTE attr)
  {
--- 1061,1065 ----
  int
  mpio_dentry_put(mpio_t *m, mpio_mem_t mem,
! 		CHAR *filename, int filename_size,
  		time_t date, DWORD fsize, WORD ssector, BYTE attr)
  {
***************
*** 1122,1132 ****
  
  BYTE *
! mpio_dentry_find_name_8_3(mpio_t *m, BYTE mem, BYTE *filename)
  {
    BYTE *p;
    BYTE bdummy;
    WORD wdummy;
!   BYTE fname[129];
!   BYTE fname_8_3[13];
    DWORD ddummy;
    BYTE *found = 0;
--- 1122,1132 ----
  
  BYTE *
! mpio_dentry_find_name_8_3(mpio_t *m, BYTE mem, CHAR *filename)
  {
    BYTE *p;
    BYTE bdummy;
    WORD wdummy;
!   CHAR fname[129];
!   CHAR fname_8_3[13];
    DWORD ddummy;
    BYTE *found = 0;
***************
*** 1152,1161 ****
  
  BYTE *
! mpio_dentry_find_name(mpio_t *m, BYTE mem, BYTE *filename)
  {
    BYTE *p;
    BYTE bdummy;
    WORD wdummy;
!   BYTE fname[129];
    DWORD ddummy;
    BYTE *found = 0;
--- 1152,1161 ----
  
  BYTE *
! mpio_dentry_find_name(mpio_t *m, BYTE mem, CHAR *filename)
  {
    BYTE *p;
    BYTE bdummy;
    WORD wdummy;
!   CHAR fname[129];
    DWORD ddummy;
    BYTE *found = 0;
***************
*** 1180,1184 ****
  
  int	
! mpio_dentry_delete(mpio_t *m, BYTE mem, BYTE *filename)
  {
    mpio_smartmedia_t *sm;
--- 1180,1184 ----
  
  int	
! mpio_dentry_delete(mpio_t *m, BYTE mem, CHAR *filename)
  {
    mpio_smartmedia_t *sm;
***************
*** 1368,1372 ****
  
  void    
! mpio_dentry_rename(mpio_t *m, mpio_mem_t mem, BYTE *p, BYTE *newfilename)
  {
    mpio_smartmedia_t *sm;
--- 1368,1372 ----
  
  void    
! mpio_dentry_rename(mpio_t *m, mpio_mem_t mem, BYTE *p, CHAR *newfilename)
  {
    mpio_smartmedia_t *sm;