Menu
▾
▴
mpio-cvslog — You can know when and how CVS tree is updated.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(67) |
Oct
(31) |
Nov
(11) |
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(2) |
Feb
(6) |
Mar
(58) |
Apr
(113) |
May
(22) |
Jun
(51) |
Jul
(45) |
Aug
(27) |
Sep
(13) |
Oct
(11) |
Nov
(2) |
Dec
|
| 2004 |
Jan
(6) |
Feb
|
Mar
(3) |
Apr
(22) |
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Andreas B. <cr...@us...> - 2006-06-18 13:48:52
|
Update of /cvsroot/mpio/mpio/debian In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv4970 Modified Files: copyright rules Log Message: updated authors info Index: rules =================================================================== RCS file: /cvsroot/mpio/mpio/debian/rules,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rules 18 Jun 2006 13:43:22 -0000 1.1 --- rules 18 Jun 2006 13:48:46 -0000 1.2 *************** *** 5,9 **** include /usr/share/cdbs/1/rules/debhelper.mk - - install/libgmbus-doc:: - mkdir -p debian/tmp/usr/share/doc/mpio/ --- 5,6 ---- Index: copyright =================================================================== RCS file: /cvsroot/mpio/mpio/debian/copyright,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** copyright 18 Jun 2006 13:43:19 -0000 1.1 --- copyright 18 Jun 2006 13:48:46 -0000 1.2 *************** *** 1,9 **** ! This is gex, written and maintained by unknown <cr...@bi...> ! on Sat, 1 Apr 2006 19:40:10 +0200. ! ! The original source can always be found at: ! ftp://ftp.debian.org/dists/unstable/main/source/ ! Copyright (C) 2005 unknown License: --- 1,7 ---- ! This is mpio, written and maintained by ! Markus Germeier <ma...@bi...> ! Andreas Buesching <cr...@bi...> ! Copyright (C) 2006 License: |
Update of /cvsroot/mpio/mpio/debian In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2671/debian Added Files: README changelog control copyright docs libmpio-dev.install libmpio.install mpio-tools.install postinst rules Log Message: add support for Debian packages --- NEW FILE: control --- (This appears to be a binary file; contents omitted.) --- NEW FILE: libmpio.install --- debian/tmp/usr/lib/libmpio* debian/tmp/etc/hotplug/usb/* --- NEW FILE: copyright --- This is gex, written and maintained by unknown <cr...@bi...> on Sat, 1 Apr 2006 19:40:10 +0200. The original source can always be found at: ftp://ftp.debian.org/dists/unstable/main/source/ Copyright (C) 2005 unknown License: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. --- NEW FILE: changelog --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rules --- #!/usr/bin/make -f include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/debhelper.mk install/libgmbus-doc:: mkdir -p debian/tmp/usr/share/doc/mpio/ --- NEW FILE: docs --- NEWS README TODO COPYING AUTHORS --- NEW FILE: libmpio-dev.install --- debian/tmp/usr/include/mpio/* --- NEW FILE: README --- The Debian Package mpio ---------------------------- Comments regarding the Package Andreas Büsching <cr...@bi...>, Sat, 1 Apr 2006 19:40:10 +0200 --- NEW FILE: mpio-tools.install --- debian/tmp/usr/bin/* debian/tmp/etc/mpio/* --- NEW FILE: postinst --- #! /bin/sh # postinst script for gex # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> # * <conflictor's-postinst> `abort-remove' `in-favour' <package> # <new-version> # * <deconfigured's-postinst> `abort-deconfigure' `in-favour' # <failed-install-package> <version> `removing' # <conflicting-package> <version> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package # case "$1" in configure) ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 |
|
From: Andreas B. <cr...@us...> - 2006-06-18 13:42:26
|
Update of /cvsroot/mpio/mpio/debian In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2199/debian Log Message: Directory /cvsroot/mpio/mpio/debian added to the repository |
|
From: Markus G. <ger...@us...> - 2006-01-21 18:33:40
|
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 *); /* |
|
From: Markus G. <ger...@us...> - 2006-01-21 18:33:30
|
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; |
|
From: Markus G. <ger...@us...> - 2006-01-21 18:33:28
|
Update of /cvsroot/mpio/mpio/mpiosh In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2698/mpiosh Modified Files: callback.c Log Message: * changed version to 0.7.1-pre3 * (hopefully) fixed signedness hell, should fix problems with 64 bit machines Index: callback.c =================================================================== RCS file: /cvsroot/mpio/mpio/mpiosh/callback.c,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** callback.c 23 Apr 2004 19:21:08 -0000 1.48 --- callback.c 21 Jan 2006 18:33:20 -0000 1.49 *************** *** 151,155 **** BYTE *p; BYTE month, day, hour, minute, type; ! BYTE fname[100]; WORD year; DWORD fsize; --- 151,155 ---- BYTE *p; BYTE month, day, hour, minute, type; ! CHAR fname[100]; WORD year; DWORD fsize; *************** *** 180,184 **** mpiosh_cmd_pwd(char *args[]) { ! BYTE pwd[INFO_LINE]; UNUSED(args); --- 180,184 ---- mpiosh_cmd_pwd(char *args[]) { ! CHAR pwd[INFO_LINE]; UNUSED(args); *************** *** 194,198 **** mpiosh_cmd_mkdir(char *args[]) { ! BYTE pwd[INFO_LINE]; BYTE r; --- 194,198 ---- mpiosh_cmd_mkdir(char *args[]) { ! CHAR pwd[INFO_LINE]; BYTE r; *************** *** 211,215 **** mpiosh_cmd_cd(char *args[]) { ! BYTE pwd[INFO_LINE]; BYTE r; --- 211,215 ---- mpiosh_cmd_cd(char *args[]) { ! CHAR pwd[INFO_LINE]; BYTE r; *************** *** 254,258 **** mpiosh_cmd_mem(char *args[]) { ! int free; MPIOSH_CHECK_CONNECTION_CLOSED; --- 254,258 ---- mpiosh_cmd_mem(char *args[]) { ! DWORD free; MPIOSH_CHECK_CONNECTION_CLOSED; *************** *** 386,391 **** int i = 0, error, ret; regex_t regex; ! BYTE fname[100]; ! BYTE errortext[100]; BYTE month, day, hour, minute, type; WORD year; --- 386,391 ---- int i = 0, error, ret; regex_t regex; ! CHAR fname[100]; ! CHAR errortext[100]; BYTE month, day, hour, minute, type; WORD year; *************** *** 484,488 **** struct stat st; regex_t regex; ! BYTE errortext[100]; MPIOSH_CHECK_CONNECTION_CLOSED; --- 484,488 ---- struct stat st; regex_t regex; ! CHAR errortext[100]; MPIOSH_CHECK_CONNECTION_CLOSED; *************** *** 580,585 **** regex_t regex; int r; ! BYTE fname[100]; ! BYTE errortext[100]; BYTE month, day, hour, minute, type; WORD year; --- 580,585 ---- regex_t regex; int r; ! CHAR fname[100]; ! CHAR errortext[100]; BYTE month, day, hour, minute, type; WORD year; *************** *** 647,651 **** BYTE *p; BYTE month, day, hour, minute, type; ! BYTE fname[256]; char *arg[2]; WORD year; --- 647,651 ---- BYTE *p; BYTE month, day, hour, minute, type; ! CHAR fname[256]; char *arg[2]; WORD year; *************** *** 677,681 **** mpiosh_cmd_free(char *args[]) { ! int free, kbytes; MPIOSH_CHECK_CONNECTION_CLOSED; --- 677,682 ---- mpiosh_cmd_free(char *args[]) { ! DWORD free; ! int kbytes; MPIOSH_CHECK_CONNECTION_CLOSED; *************** *** 699,704 **** mpiosh_cmd_format(char *args[]) { ! char answer[512]; ! BYTE *config, *fmconfig, *rconfig, *fontconfig; int csize, fmsize, rsize, fontsize; --- 700,705 ---- mpiosh_cmd_format(char *args[]) { ! CHAR answer[512]; ! CHAR *config, *fmconfig, *rconfig, *fontconfig; int csize, fmsize, rsize, fontsize; *************** *** 1080,1084 **** mpiosh_cmd_channel(char *args[]) { ! BYTE *channel_data, *p, name[17]; int size; int i; --- 1081,1085 ---- mpiosh_cmd_channel(char *args[]) { ! CHAR *channel_data, *p, name[17]; int size; int i; *************** *** 1272,1276 **** mpiosh_cmd_id3_format(char *args[]) { ! BYTE format[INFO_LINE]; MPIOSH_CHECK_CONNECTION_CLOSED; --- 1273,1277 ---- mpiosh_cmd_id3_format(char *args[]) { ! CHAR format[INFO_LINE]; MPIOSH_CHECK_CONNECTION_CLOSED; |
|
From: Markus G. <ger...@us...> - 2006-01-21 18:33:28
|
Update of /cvsroot/mpio/mpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2698 Modified Files: ChangeLog configure.in Log Message: * changed version to 0.7.1-pre3 * (hopefully) fixed signedness hell, should fix problems with 64 bit machines Index: ChangeLog =================================================================== RCS file: /cvsroot/mpio/mpio/ChangeLog,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** ChangeLog 20 Apr 2005 17:36:02 -0000 1.142 --- ChangeLog 21 Jan 2006 18:33:19 -0000 1.143 *************** *** 1,2 **** --- 1,10 ---- + 2006-01-21 Markus Germeier <ma...@tz...> + * changed version to 0.7.1-pre3 + * (hopefully) fixed signedness hell, + should fix problems with 64 bit machines + + 2006-01-20 Markus Germeier <ma...@tz...> + * fixed mpio.spec.in + 2005-04-20 Markus Germeier <ma...@tz...> * configure.in: Index: configure.in =================================================================== RCS file: /cvsroot/mpio/mpio/configure.in,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** configure.in 20 Apr 2005 17:36:02 -0000 1.26 --- configure.in 21 Jan 2006 18:33:19 -0000 1.27 *************** *** 11,15 **** AC_MSG_RESULT(Building for a ${host} host.) ! AM_INIT_AUTOMAKE(mpio, 0.7.1_pre2-1) dnl build release variable --- 11,15 ---- AC_MSG_RESULT(Building for a ${host} host.) ! AM_INIT_AUTOMAKE(mpio, 0.7.1_pre3-1) dnl build release variable |
|
From: Markus G. <ger...@us...> - 2006-01-20 08:13:07
|
Update of /cvsroot/mpio/mpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1352 Modified Files: mpio.spec.in Log Message: fixed License for newer rpm versions Index: mpio.spec.in =================================================================== RCS file: /cvsroot/mpio/mpio/mpio.spec.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mpio.spec.in 19 Apr 2004 12:19:19 -0000 1.12 --- mpio.spec.in 20 Jan 2006 08:12:56 -0000 1.13 *************** *** 10,14 **** Name: %name Release: %release ! Copyright: see COPYING Group: Applications/MultiMedia Source: http://download.sourceforge.net/mpio/mpio-@VERSION@.tar.gz --- 10,14 ---- Name: %name Release: %release ! License: GPL Group: Applications/MultiMedia Source: http://download.sourceforge.net/mpio/mpio-@VERSION@.tar.gz |
|
From: Markus G. <ger...@us...> - 2005-04-20 17:36:11
|
Update of /cvsroot/mpio/mpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3575 Modified Files: ChangeLog configure.in Log Message: fixed version check for libusb, use black list instead Index: ChangeLog =================================================================== RCS file: /cvsroot/mpio/mpio/ChangeLog,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -d -r1.141 -r1.142 *** ChangeLog 31 May 2004 09:28:49 -0000 1.141 --- ChangeLog 20 Apr 2005 17:36:02 -0000 1.142 *************** *** 1,2 **** --- 1,6 ---- + 2005-04-20 Markus Germeier <ma...@tz...> + * configure.in: + fix version check for libusb, use black list instead + 2004-05-31 Markus Germeier <ma...@tz...> * libmpio/src/mpio.c (mpio_init_external): Index: configure.in =================================================================== RCS file: /cvsroot/mpio/mpio/configure.in,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** configure.in 30 May 2004 01:46:50 -0000 1.25 --- configure.in 20 Apr 2005 17:36:02 -0000 1.26 *************** *** 79,85 **** fi ! # This 'test' call uses non-standard syntax and will fail on most ! # systems, but it's just informational so any warning can be ignored. ! if test "$LIBUSB_VER" \< "0.1.7"; then AC_MSG_WARN([ *** You need at least version 0.1.7 of the libusb library for USB support --- 79,85 ---- fi ! dnl --- blacklist the too old versions ! case "$LIBUSB_VER" in ! 0.1.[[0123456]]|0.1.[[36]][[ab]]) AC_MSG_WARN([ *** You need at least version 0.1.7 of the libusb library for USB support *************** *** 87,92 **** *** If you cannot find the appropriate version, try CVS ]) ! exit 1 ! fi case "$usb_msg" in --- 87,93 ---- *** If you cannot find the appropriate version, try CVS ]) ! exit 1 ;; ! *);; ! esac case "$usb_msg" in |
|
From: Scott H. <sh...@us...> - 2004-09-20 01:29:41
|
Update of /cvsroot/mpio/kmpio/kmpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26489/kmpio Modified Files: kmpio_interface.cpp kmpio_interface.h kmpio_mainwidget.cpp kmpio_mainwidget.h Log Message: added recursive upload/download/delete functionss. added recursive upload/download/delete functions. Index: kmpio_mainwidget.cpp =================================================================== RCS file: /cvsroot/mpio/kmpio/kmpio/kmpio_mainwidget.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** kmpio_mainwidget.cpp 25 Apr 2004 15:09:42 -0000 1.25 --- kmpio_mainwidget.cpp 20 Sep 2004 01:29:32 -0000 1.26 *************** *** 385,389 **** QAction *shiftFileUpAction = new QAction( this, "shiftFileUpAction"); shiftFileUpAction->setText( trUtf8( "Move file up in MPIO play list. Hot-Key: Alt+Up" ) ); ! shiftFileUpAction->setMenuText( trUtf8( "Playlist: Move file up\tAlt-Up" ) ); shiftFileUpAction->setAccel( 0 ); --- 385,389 ---- QAction *shiftFileUpAction = new QAction( this, "shiftFileUpAction"); shiftFileUpAction->setText( trUtf8( "Move file up in MPIO play list. Hot-Key: Alt+Up" ) ); ! shiftFileUpAction->setMenuText( trUtf8( "Playlist: Move file up\tAlt+Up" ) ); shiftFileUpAction->setAccel( 0 ); *************** *** 403,406 **** --- 403,412 ---- renameFileAction->setAccel( 0 ); + + QAction *deleteFileAction = new QAction( this, "deleteFileAction"); + deleteFileAction->setText( trUtf8( "Delete file in MPIO memory. Hot-Key: Del" ) ); + deleteFileAction->setMenuText( trUtf8( "&Delete MPIO file" ) ); + deleteFileAction->setAccel( 0 ); + QAction *uploadAsMusicAction = new QAction( this, "uploadMusicAction"); uploadAsMusicAction->setText( trUtf8( "Upload music files to MPIO player") ); *************** *** 409,413 **** QAction *uploadAsPlainAction = new QAction( this, "uploadPlainAction"); ! uploadAsPlainAction->setText( trUtf8( "Upload music files to MPIO player") ); uploadAsPlainAction->setMenuText( trUtf8( "upload &Plain files" ) ); uploadAsPlainAction->setAccel( 0 ); --- 415,419 ---- QAction *uploadAsPlainAction = new QAction( this, "uploadPlainAction"); ! uploadAsPlainAction->setText( trUtf8( "Upload plain files to MPIO player") ); uploadAsPlainAction->setMenuText( trUtf8( "upload &Plain files" ) ); uploadAsPlainAction->setAccel( 0 ); *************** *** 466,469 **** --- 472,477 ---- uploadAsConfAction->addTo( uploadMenu ); + deleteFileAction->addTo( mpioMenu ); + mpioMenu->insertSeparator(); shiftFileUpAction->addTo( mpioMenu ); *************** *** 498,501 **** --- 506,511 ---- connect( renameFileAction, SIGNAL( activated() ), this, SLOT( mpioRenameFile() ) ); + connect( deleteFileAction, SIGNAL( activated() ), + this, SLOT( deleteFile() ) ); connect( playerInfoAction, SIGNAL( activated() ), this, SLOT( playerInfo() ) ); *************** *** 707,712 **** for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it ) { ! ftotal = QStringList::split("*", *it); lvi = new QListViewItem(kmpio_externalfiles, kmpio_externalfiles->lastItem()); lvi->setText(0,ftotal[0]); --- 717,726 ---- for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it ) { ! ftotal = QStringList::split("*", *it); + + if (ftotal[3].left(7) == FTYPE_NAME_UNKNOWN) // skip unknown filetypes + continue; + lvi = new QListViewItem(kmpio_externalfiles, kmpio_externalfiles->lastItem()); lvi->setText(0,ftotal[0]); *************** *** 731,736 **** for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it ) { ! ftotal = QStringList::split("*", *it); lvi = new QListViewItem(kmpio_internalfiles, kmpio_internalfiles->lastItem()); lvi->setText(0,ftotal[0]); --- 745,754 ---- for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it ) { ! ftotal = QStringList::split("*", *it); + + if (ftotal[3].left(7) == FTYPE_NAME_UNKNOWN) // skip unknown filetypes + continue; + lvi = new QListViewItem(kmpio_internalfiles, kmpio_internalfiles->lastItem()); lvi->setText(0,ftotal[0]); *************** *** 843,846 **** --- 861,865 ---- int tabsel = targetTab->currentPageIndex(); + if (tabsel == 0) { curr = kmpio_internalfiles->currentItem(); *************** *** 911,914 **** --- 930,934 ---- QListViewItem *curr; QStringList fnames; + QValueList<QListViewItem*> itemList; int tab = targetTab->currentPageIndex(); *************** *** 929,934 **** QListViewItem *curr; QStringList fnames; ! int tab = targetTab->currentPageIndex(); if (tab == 0) --- 949,960 ---- QListViewItem *curr; QStringList fnames; + QValueList<QListViewItem*> itemList; + int tab; ! if (!isConnected()) { ! not_connected(); ! return; ! } ! tab = targetTab->currentPageIndex(); if (tab == 0) *************** *** 938,948 **** while (curr != NULL) { ! if ( (curr->isSelected()) & ! (curr->text(3) != QString(FTYPE_NAME_DIR) ) ) { ! fnames.append(curr->text(0)); ! } ! curr = curr->nextSibling(); } ! // for ( QStringList::Iterator it = fnames.begin(); // it != fnames.end(); ++it ) { --- 964,986 ---- while (curr != NULL) { ! if ( (curr->isSelected()) ) ! itemList.append(curr); ! curr = curr->nextSibling(); } ! ! for ( QValueList<QListViewItem*>::Iterator it = itemList.begin(); ! it != itemList.end(); ++it ) ! { ! curr = *it; ! if (curr->text(3) == QString(FTYPE_NAME_DIR) ) ! { ! downloadDir(curr->text(0)); ! } ! else ! { ! fnames.append(curr->text(0)); ! } ! } ! // for ( QStringList::Iterator it = fnames.begin(); // it != fnames.end(); ++it ) { *************** *** 961,964 **** --- 999,1063 ---- } + void kmpio_mainwidget::downloadDir(QString dirname) + { + QStringList entries, ftotal, fnames; + QString oldPath; + + int tab = targetTab->currentPageIndex(); + if (tab == 0) + { + if (interface->chdirInternal(dirname)) + return; + // give error message if fail + } + else + { + if(interface->chdirExternal(dirname)) + return; + // give error message if fail + } + oldPath = QDir::current().absPath(); // QDir::currentDirPath(); + + if (!QDir::setCurrent(dirname)) + { + QDir::current().mkdir(dirname); + QDir::setCurrent(dirname); + } + + if (tab == 0) + entries = interface->getDirectoryInternal(); + else + entries = interface->getDirectoryExternal(); + + + for ( QStringList::Iterator it = entries.begin(); + it != entries.end(); ++it ) { + ftotal = QStringList::split("*", *it); + if (ftotal[3].left(7) == FTYPE_NAME_UNKNOWN) // skip unknown filetypes + continue; + if (ftotal[3] == QString(FTYPE_NAME_DIR)) + { + if (ftotal[0] == "." || ftotal[0] == "..") + continue; + downloadDir(ftotal[0]); + } + else + fnames.append(ftotal[0]); + } + + if (tab == 0) { + interface->mgetFile(fnames, MPIO_INTERNAL_MEM); + interface->chdirInternal(".."); + readDirInternal(); + } else { + interface->mgetFile(fnames, MPIO_EXTERNAL_MEM); + interface->chdirExternal(".."); + readDirExternal(); + } + QDir::setCurrent(oldPath); + + download_completed(); + } + void kmpio_mainwidget::download_completed() { parseCurrentDir(); *************** *** 991,1000 **** return; } ! QListViewItem *curr; QStringList fnames; QFileInfo testname; int tab = targetTab->currentPageIndex(); ! curr = kmpio_localfiles->firstChild(); while (curr != NULL) { --- 1090,1115 ---- return; } ! QListViewItem *curr = NULL, *fileCurr; QStringList fnames; QFileInfo testname; int tab = targetTab->currentPageIndex(); ! fileCurr = kmpio_localfiles->firstChild(); ! // fprintf (stderr, "%p\n", fileCurr); ! while (fileCurr != NULL) ! { ! if (fileCurr->isSelected()) ! { ! curr = kmpio_localfiles->firstChild(); ! break; ! } ! fileCurr = fileCurr->nextSibling(); ! } ! if (curr == NULL) ! { ! curr = kmpio_localdirectory->firstChild(); ! } ! ! // fprintf (stderr, "%p\n", curr); while (curr != NULL) { *************** *** 1002,1007 **** testname = curr->text(0); if (testname.isFile()) { ! fnames.append(curr->text(0)); } } curr = curr->nextSibling(); --- 1117,1131 ---- testname = curr->text(0); if (testname.isFile()) { ! fnames.append(curr->text(0)); } + else if(testname.isDir()) + { + if (testname.fileName() == "." || + testname.fileName() == "..") + continue; + fprintf (stderr, "upload %s\n", (const char*)testname.fileName()); + uploadDir(testname.fileName(), type); + } + } curr = curr->nextSibling(); *************** *** 1022,1025 **** --- 1146,1150 ---- interface->mputFileAs(fnames,MPIO_EXTERNAL_MEM,type); + upload_completed(); } *************** *** 1034,1041 **** } void kmpio_mainwidget::deleteFile() { QListViewItem *curr; QStringList fnames; ! int mem = targetTab->currentPageIndex(); if (mem == 0) --- 1159,1237 ---- } + void kmpio_mainwidget::uploadDir(QString dirname, mpio_filetype_t type) + { + int tab = targetTab->currentPageIndex(); + if (tab == 0) + { + if (interface->changeDirectory(dirname, MPIO_INTERNAL_MEM)) + { + interface->createDirectory(dirname, MPIO_INTERNAL_MEM); + interface->chdirInternal(dirname); + } + } + else + { + if(interface->changeDirectory(dirname, MPIO_EXTERNAL_MEM)) + { + interface->createDirectory(dirname, MPIO_EXTERNAL_MEM); + interface->chdirExternal(dirname); + } + } + QDir d(QDir::current()); + fprintf (stderr, "dir: %s\n", (const char*)d.absPath()); + d.cd(dirname); + + QString fileTypeString = fileTypes->currentText(); + fileTypeString.replace( QRegExp(".*\\("), "" ); + fileTypeString.replace( QRegExp("\\).*"), "" ); + + d.setFilter (QDir::All); + d.setNameFilter(fileTypeString.lower() + QString(";") + fileTypeString.upper()); + d.setMatchAllDirs(true); + d.setSorting( QDir::Name | QDir::DirsFirst ); + + fprintf (stderr, "dir: %s\n", (const char*)d.absPath()); + + QString oldPath = QDir::current().absPath(); + QDir::setCurrent(d.absPath()); + + const QFileInfoList *list = d.entryInfoList(); + QFileInfoListIterator it( *list ); + QFileInfo *fi; + QString strsize; + QStringList fnames; + + while ( (fi = it.current()) != 0 ) { + if (fi->isDir()) { + if (fi->fileName() != "." && fi->fileName() != "..") + uploadDir(fi->fileName(), type); + } else { + fnames.append(fi->fileName()); + } + ++it; + } + + + if (tab == 0) { + interface->mputFileAs(fnames,MPIO_INTERNAL_MEM,type); + interface->chdirInternal(".."); + } else { + interface->mputFileAs(fnames,MPIO_EXTERNAL_MEM,type); + interface->chdirExternal(".."); + } + QDir::setCurrent(oldPath); + } + void kmpio_mainwidget::deleteFile() { QListViewItem *curr; QStringList fnames; ! QStringList dirNames; ! int mem; ! ! if (!isConnected()) { ! not_connected(); ! return; ! } ! mem = targetTab->currentPageIndex(); if (mem == 0) *************** *** 1045,1055 **** while (curr != NULL) { ! if (curr->isSelected()) { ! fnames.append(curr->text(0)); ! } curr = curr->nextSibling(); } ! ! if (!fnames.isEmpty()) { QString msg; msg.sprintf("Are you sure you want to delete %d file%s\n" --- 1241,1259 ---- while (curr != NULL) { ! if (curr->isSelected()) { ! if (curr->text(3) == QString(FTYPE_NAME_DIR)) { ! QString dirName = curr->text(0); ! if (dirName == QString(".") || dirName == QString("..")) ! continue; ! dirNames.append(curr->text(0)); ! } else { ! fnames.append(curr->text(0)); ! } ! } curr = curr->nextSibling(); } ! ! ! if (!fnames.isEmpty() || !dirNames.isEmpty()) { QString msg; msg.sprintf("Are you sure you want to delete %d file%s\n" *************** *** 1072,1075 **** --- 1276,1284 ---- // interface->delFileExternal(fname); // } + for ( QStringList::Iterator it = dirNames.begin(); + it != dirNames.end(); ++it ) + { + deleteDir(QString(*it)); + } if (mem == 0) *************** *** 1079,1082 **** --- 1288,1344 ---- } } + delete_completed(); + } + + void kmpio_mainwidget::deleteDir(QString dirname) + { + int tab = targetTab->currentPageIndex(); + if (tab == 0) + { + if (interface->changeDirectory(dirname, MPIO_INTERNAL_MEM)) + { + // give error message if fail + return; + } + } + else + { + if(interface->changeDirectory(dirname, MPIO_EXTERNAL_MEM)) + { + // give error message if fail + return; + } + } + QStringList entries; + if (tab == 0) + entries = interface->getDirectoryInternal(); + else + entries = interface->getDirectoryExternal(); + QStringList ftotal, fnames; + + for ( QStringList::Iterator it = entries.begin(); + it != entries.end(); ++it ) { + ftotal = QStringList::split("*", *it); + if (ftotal[3] == FTYPE_NAME_UNKNOWN) + continue; + if (ftotal[3] == QString(FTYPE_NAME_DIR)) + { + if (ftotal[0] == "." || ftotal[0] == "..") + continue; + deleteDir(ftotal[0]); + } + else + fnames.append(ftotal[0]); + } + + if (tab == 0) { + interface->mdelFile(fnames, MPIO_INTERNAL_MEM); + interface->chdirInternal(".."); + interface->delFileInternal(dirname); + } else { + interface->mdelFile(fnames, MPIO_EXTERNAL_MEM); + interface->chdirExternal(".."); + interface->delFileExternal(dirname); + } } Index: kmpio_interface.cpp =================================================================== RCS file: /cvsroot/mpio/kmpio/kmpio/kmpio_interface.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** kmpio_interface.cpp 25 Nov 2003 18:47:33 -0000 1.15 --- kmpio_interface.cpp 20 Sep 2004 01:29:31 -0000 1.16 *************** *** 224,228 **** tmp = tm.toString(Qt::LocalDate).latin1(); } ! fileinfo.sprintf("%d*"+tmp, fsize ); } --- 224,228 ---- tmp = tm.toString(Qt::LocalDate).latin1(); } ! fileinfo.sprintf("%d* "+tmp, fsize ); } *************** *** 237,245 **** int kmpio_interface::chdirExternal(QString fname) { ! return changeDirectory(fname, MPIO_EXTERNAL_MEM); } int kmpio_interface::chdirInternal(QString fname) { ! return changeDirectory(fname, MPIO_INTERNAL_MEM); } --- 237,261 ---- int kmpio_interface::chdirExternal(QString fname) { ! int p; ! p = changeDirectory(fname, MPIO_EXTERNAL_MEM); ! ! if (p != 0) { ! // Error occurred ! progress->hide(); ! failure(); ! } ! return p; } int kmpio_interface::chdirInternal(QString fname) { ! int p; ! p = changeDirectory(fname, MPIO_INTERNAL_MEM); ! ! if (p != 0) { ! // Error occurred ! progress->hide(); ! failure(); ! } ! return p; } *************** *** 250,259 **** p = mpio_directory_cd( handle, card, (unsigned char*)fname_utf8.data() ); - - if (p != 0) { - // Error occurred - progress->hide(); - failure(); - } return p; } --- 266,269 ---- Index: kmpio_interface.h =================================================================== RCS file: /cvsroot/mpio/kmpio/kmpio/kmpio_interface.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** kmpio_interface.h 26 Oct 2003 17:30:29 -0000 1.12 --- kmpio_interface.h 20 Sep 2004 01:29:32 -0000 1.13 *************** *** 44,47 **** --- 44,48 ---- #define FTYPE_NAME_DIR "Directory" #define FTYPE_NAME_PLAIN "Plain" + #define FTYPE_NAME_UNKNOWN "Unknown" class kmpio_progress; Index: kmpio_mainwidget.h =================================================================== RCS file: /cvsroot/mpio/kmpio/kmpio/kmpio_mainwidget.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** kmpio_mainwidget.h 26 Sep 2003 17:42:45 -0000 1.13 --- kmpio_mainwidget.h 20 Sep 2004 01:29:32 -0000 1.14 *************** *** 152,156 **** --- 152,158 ---- virtual void mpioDblClick(); virtual void downloadFile(); + virtual void downloadDir(QString dirname); virtual void uploadFile(); + virtual void uploadDir(QString dirname, mpio_filetype_t type); virtual void uploadMusicFile(); *************** *** 164,167 **** --- 166,171 ---- virtual void mpioDirectorySelected(); virtual void deleteFile(); + virtual void deleteDir(QString dirname); + virtual void formatInternalMemory(); virtual void formatExternalMemory(); |
|
From: Scott H. <sh...@us...> - 2004-09-20 01:29:40
|
Update of /cvsroot/mpio/kmpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26489 Modified Files: ChangeLog Log Message: added recursive upload/download/delete functionss. added recursive upload/download/delete functions. Index: ChangeLog =================================================================== RCS file: /cvsroot/mpio/kmpio/ChangeLog,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ChangeLog 25 Nov 2003 18:47:33 -0000 1.19 --- ChangeLog 20 Sep 2004 01:29:31 -0000 1.20 *************** *** 1,2 **** --- 1,17 ---- + 2004-09-19 Scott Hoge <shoge> + + * kmpio/kmpio_mainwidget.cpp,kmpio/kmpio_interface.cpp: + incorporated Dmitry's recursive upload and delete functions. + + 2004-09-11 Scott Hoge <shoge> + + * kmpio/kmpio_mainwidget.cpp: incorporated dirDownload patch + submitted by Dmitry M. Fedin + + 2004-09-09 Scott Hoge <shoge> + + * kmpio/kmpio_interface.cpp: fixed a minor bug so that Unknown + filetypes are given a null date. (added a single space to L226) + 2003-11-25 Scott Hoge <sh...@ec...> * fixed a bug in upload code: progress window was hidden after |
|
From: Markus G. <ger...@us...> - 2004-05-31 09:29:00
|
Update of /cvsroot/mpio/mpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25026 Modified Files: ChangeLog Log Message: fixed stupid bugs Index: ChangeLog =================================================================== RCS file: /cvsroot/mpio/mpio/ChangeLog,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** ChangeLog 30 May 2004 16:28:51 -0000 1.140 --- ChangeLog 31 May 2004 09:28:49 -0000 1.141 *************** *** 1,2 **** --- 1,6 ---- + 2004-05-31 Markus Germeier <ma...@tz...> + * libmpio/src/mpio.c (mpio_init_external): + fixed stupid bugs + 2004-05-30 Markus Germeier <ma...@tz...> * added Roberts MMC code (step 1) |
|
From: Markus G. <ger...@us...> - 2004-05-31 09:29:00
|
Update of /cvsroot/mpio/mpio/libmpio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25026/libmpio/src Modified Files: mpio.c Log Message: fixed stupid bugs Index: mpio.c =================================================================== RCS file: /cvsroot/mpio/mpio/libmpio/src/mpio.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mpio.c 30 May 2004 16:28:52 -0000 1.16 --- mpio.c 31 May 2004 09:28:50 -0000 1.17 *************** *** 252,257 **** /* these players have a MMC/SD slot */ ! if ((m->model != MPIO_MODEL_VP_02) && ! (m->model != MPIO_MODEL_FL100)) { debugn(0, "Trying to detect external MMC. This is work in progress. BEWARE!!\n"); debugn(0, "Please report your findings to mpi...@li...\n"); --- 252,257 ---- /* these players have a MMC/SD slot */ ! if ((m->model == MPIO_MODEL_VP_02) || ! (m->model == MPIO_MODEL_FL100)) { debugn(0, "Trying to detect external MMC. This is work in progress. BEWARE!!\n"); debugn(0, "Please report your findings to mpi...@li...\n"); *************** *** 259,263 **** hexdumpn(0, m->version, 64); ! mpio_mmc_detect_memory(m, sm); if (sm->size) { --- 259,263 ---- hexdumpn(0, m->version, 64); ! mpio_mmc_detect_memory(m, MPIO_EXTERNAL_MEM); if (sm->size) { |
|
From: Markus G. <ger...@us...> - 2004-05-30 16:29:01
|
Update of /cvsroot/mpio/mpio/libmpio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24870/libmpio/src Modified Files: fat.c mpio.c Added Files: mmc.c mmc.h Log Message: added Roberts MMC code (step 1) --- NEW FILE: mmc.h --- /* * $Id: mmc.h,v 1.1 2004/05/30 16:28:52 germeier Exp $ * * libmpio - a library for accessing Digit@lways MPIO players * Copyright (C) 2004 Robert Kellington, Markus Germeier * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc.,g 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ #ifndef _MPIO_MMC_H_ #define _MPIO_MMC_H_ #include "defs.h" #ifdef __cplusplus extern "C" { #endif extern mpio_disk_phy_t MPIO_DISK_GEO_001; extern mpio_disk_phy_t MPIO_DISK_GEO_002; extern mpio_disk_phy_t MPIO_DISK_GEO_004; extern mpio_disk_phy_t MPIO_DISK_GEO_008; extern mpio_disk_phy_t MPIO_DISK_GEO_016; extern mpio_disk_phy_t MPIO_DISK_GEO_032; extern mpio_disk_phy_t MPIO_DISK_GEO_064; extern mpio_disk_phy_t MPIO_DISK_GEO_128; extern mpio_disk_phy_t MPIO_DISK_GEO_256; /* get our configuration for MMC cards right */ BYTE mpio_mmc_detect_memory(mpio_t *m, mpio_mem_t mem); #ifdef __cplusplus } #endif #endif /* _MPIO_MMC_H_ */ Index: mpio.c =================================================================== RCS file: /cvsroot/mpio/mpio/libmpio/src/mpio.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mpio.c 24 Apr 2004 16:09:58 -0000 1.15 --- mpio.c 30 May 2004 16:28:52 -0000 1.16 *************** *** 161,164 **** --- 161,165 ---- /* init main memory parameters */ + sm->mmc = 0; sm->manufacturer = m->version[i_offset]; sm->id = m->version[i_offset + 1]; *************** *** 250,261 **** BYTE e_offset = 0x20; /* heuristic to find the right offset for the external memory */ while((e_offset < 0x3a) && !(mpio_id_valid(m->version[e_offset]))) e_offset++; ! if ((mpio_id_valid(m->version[e_offset])) && ! (m->model != MPIO_MODEL_VP_02) && ! (m->model != MPIO_MODEL_FL100)) /* ignore external memory ATM until ! we know how to support it! */ { sm->manufacturer = m->version[e_offset]; --- 251,288 ---- BYTE e_offset = 0x20; + /* these players have a MMC/SD slot */ + if ((m->model != MPIO_MODEL_VP_02) && + (m->model != MPIO_MODEL_FL100)) { + debugn(0, "Trying to detect external MMC. This is work in progress. BEWARE!!\n"); + debugn(0, "Please report your findings to mpi...@li...\n"); + debugn(0, "and include the following information block\n"); + hexdumpn(0, m->version, 64); + + mpio_mmc_detect_memory(m, sm); + + if (sm->size) { + debugn(0, "You are lucky! ;-) I found a %d MB MMC card.\n", sm->size); + debugn(0, "disabling memory, because low-level routines \n" + "are not integrated, yet. Please stay tuned.\n"); + sm->size = 0; + } else { + debugn(0, "I'm sorry, I did not detect a MMC card.\n" + "If you think I should have, please report this to the mpio-devel list.\n"); + } + + return; + } else { + sm->mmc=0; + sm->manufacturer = 0; + sm->id = 0; + sm->chips = 0; + sm->size = 0; + } + /* heuristic to find the right offset for the external memory */ while((e_offset < 0x3a) && !(mpio_id_valid(m->version[e_offset]))) e_offset++; ! if ((mpio_id_valid(m->version[e_offset]))) { sm->manufacturer = m->version[e_offset]; *************** *** 418,426 **** /* read FAT/spare area */ ! if (new_mpio->internal.id) mpio_fat_read(new_mpio, MPIO_INTERNAL_MEM, progress_callback); /* read the spare area (for block mapping) */ ! if (new_mpio->external.id) { sm = &new_mpio->external; --- 445,453 ---- /* read FAT/spare area */ ! if (new_mpio->internal.size) mpio_fat_read(new_mpio, MPIO_INTERNAL_MEM, progress_callback); /* read the spare area (for block mapping) */ ! if (new_mpio->external.size) { sm = &new_mpio->external; *************** *** 524,549 **** snprintf(info->model, max, "%s", mpio_model_name[m->model]); ! if (!m->internal.id) { snprintf(info->mem_internal, max, "not available"); } else { ! if (m->internal.chips == 1) ! { ! snprintf(info->mem_internal, max, "%3dMB (%s)", ! mpio_id2mem(m->internal.id), ! mpio_id2manufacturer(m->internal.manufacturer)); ! } else { ! snprintf(info->mem_internal, max, "%3dMB (%s) - %d chips", ! mpio_id2mem(m->internal.id)*m->internal.chips, ! mpio_id2manufacturer(m->internal.manufacturer), ! m->internal.chips); ! } } ! if (m->external.id) { ! snprintf(info->mem_external, max, "%3dMB (%s)", ! mpio_id2mem(m->external.id), ! mpio_id2manufacturer(m->external.manufacturer)); } else { snprintf(info->mem_external, max, "not available"); --- 551,586 ---- snprintf(info->model, max, "%s", mpio_model_name[m->model]); ! if (!m->internal.size) { snprintf(info->mem_internal, max, "not available"); } else { ! if (m->internal.mmc) { ! snprintf(info->mem_internal, max, "%3dMB (MMC)", ! m->internal.size); ! } else { ! if (m->internal.chips == 1) ! { ! snprintf(info->mem_internal, max, "%3dMB (%s)", ! mpio_id2mem(m->internal.id), ! mpio_id2manufacturer(m->internal.manufacturer)); ! } else { ! snprintf(info->mem_internal, max, "%3dMB (%s) - %d chips", ! mpio_id2mem(m->internal.id)*m->internal.chips, ! mpio_id2manufacturer(m->internal.manufacturer), ! m->internal.chips); ! } ! } } ! if (m->external.size) { ! if (m->external.mmc) { ! snprintf(info->mem_external, max, "%3dMB (MMC)", ! m->external.size); ! } else { ! snprintf(info->mem_external, max, "%3dMB (%s)", ! mpio_id2mem(m->external.id), ! mpio_id2manufacturer(m->external.manufacturer)); ! } } else { snprintf(info->mem_external, max, "not available"); --- NEW FILE: mmc.c --- /* * $Id: mmc.c,v 1.1 2004/05/30 16:28:52 germeier Exp $ * * libmpio - a library for accessing Digit@lways MPIO players * Copyright (C) 2004 Robert Kellington, Markus Germeier * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc.,g 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ #include <stdio.h> #include <stdlib.h> #include "mmc.h" #include "debug.h" /* This routine attempts to detect when mmc module is present and set some variables according to that size. If adding a new memory module do the following changes: 1. Add the appropriate switch below (size and geo need to be set). 2. Add the new module size and array data into the routines mmc_mpio_mbr_gen and mmc_mpio_pbr_gen for the memory formating. That should be all */ BYTE mpio_mmc_detect_memory(mpio_t *m, mpio_mem_t mem) { mpio_smartmedia_t *sm=0; int size; /* just in case we encounter a player with an internel mmc memory */ if (mem == MPIO_INTERNAL_MEM) sm = &m->internal; if (mem == MPIO_EXTERNAL_MEM) sm = &m->external; if (!sm) { debug("error in memory selection, aborting\n"); exit (-1); } /*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 */ /*NOTE: This size needs formating to be added and testing*/ sm->size = 16; sm->geo = MPIO_DISK_GEO_016; break; case 0x1e: /* 32 Mb */ sm->size = 32; sm->geo = MPIO_DISK_GEO_032; break; case 0x3b: /* 64 Mb */ sm->size = 64; sm->geo = MPIO_DISK_GEO_064; break; case 0x78: /* 128 Mb */ sm->size = 128; sm->geo = MPIO_DISK_GEO_128; break; case 0xf1: /* 256 Mb */ sm->size = 256; sm->geo = MPIO_DISK_GEO_256; break; default: debug("Found MMC memory markers but didn't recognize size\n"); sm->mmc = 0; sm->size = 0; return 0; } sm->mmc = 1; sm->chips = 1; sm->version = 0; sm->id = 0x78; /* Assigning my random id */ debug("Found MMC memory and all is OK so far\n"); return 1; } debug("Not recognized MMC memory\n"); return 0; } Index: fat.c =================================================================== RCS file: /cvsroot/mpio/mpio/libmpio/src/fat.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** fat.c 19 Oct 2003 21:06:35 -0000 1.5 --- fat.c 30 May 2004 16:28:52 -0000 1.6 *************** *** 212,220 **** /* 128 MB need 2 Bytes instead of 1.5 */ ! if (sm->size != 128) { - temp = ((total_sector / 0x20 * 0x03 / 0x02 / 0x200) + 0x01); - } else { temp = ((total_sector / 0x20 * 0x02 / 0x200) + 0x01); } --- 212,220 ---- /* 128 MB need 2 Bytes instead of 1.5 */ ! if (sm->size >= 128) { temp = ((total_sector / 0x20 * 0x02 / 0x200) + 0x01); + } else { + temp = ((total_sector / 0x20 * 0x03 / 0x02 / 0x200) + 0x01); } *************** *** 542,546 **** ! if (sm->size == 128) { /* 2 Byte per entry */ e = f->entry * 2; --- 542,546 ---- ! if (sm->size >= 128) { /* 2 Byte per entry */ e = f->entry * 2; *************** *** 579,583 **** if (mem == MPIO_EXTERNAL_MEM) sm = &m->external; ! if (sm->size == 128) { /* 2 Byte per entry */ --- 579,583 ---- if (mem == MPIO_EXTERNAL_MEM) sm = &m->external; ! if (sm->size >= 128) { /* 2 Byte per entry */ *************** *** 754,758 **** f->entry = value; ! if (sm->size==128) { endvalue = 0xfff8; --- 754,758 ---- f->entry = value; ! if (sm->size>=128) { endvalue = 0xfff8; *************** *** 792,796 **** sm->fat[2] = 0xff; /* for FAT 16 */ ! if (sm->size == 128) sm->fat[3] = 0xff; } --- 792,796 ---- sm->fat[2] = 0xff; /* for FAT 16 */ ! if (sm->size >= 128) sm->fat[3] = 0xff; } |
|
From: Markus G. <ger...@us...> - 2004-05-30 16:29:00
|
Update of /cvsroot/mpio/mpio/libmpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24870/libmpio Modified Files: Makefile.am defs.h Log Message: added Roberts MMC code (step 1) Index: defs.h =================================================================== RCS file: /cvsroot/mpio/mpio/libmpio/defs.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** defs.h 23 Apr 2004 19:21:07 -0000 1.34 --- defs.h 30 May 2004 16:28:51 -0000 1.35 *************** *** 66,69 **** --- 66,73 ---- GET_SPARE_AREA = 0x07, PUT_BLOCK = 0x08, + MMC_GET_BLOCK = 0x11, + MMC_GET_BIG_BLOCK= 0x12, + MMC_WRITE_SECTOR = 0x18, + MMC_WRITE_CLUSTER= 0x19, PUT_MEGABLOCK = 0x30, MODIFY_FIRMWARE = 0xa0 } mpio_cmd_t; *************** *** 266,269 **** --- 270,279 ---- BYTE recursive_directory; + /* OK sue me, we can also handle the MMCs with this */ + BYTE mmc; /* Added for external MMC memory modules */ + int mmc_sector_size; /* Bytes/sector */ + BYTE mmc_cluster_size; /* Sectors/Cluster */ + int mmc_addressing_offset; /* Offset used in addressing - varies for mmc chip size */ + } mpio_smartmedia_t; Index: Makefile.am =================================================================== RCS file: /cvsroot/mpio/mpio/libmpio/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.am 19 Oct 2003 21:06:34 -0000 1.10 --- Makefile.am 30 May 2004 16:28:51 -0000 1.11 *************** *** 10,13 **** --- 10,14 ---- src/debug.c \ src/smartmedia.c \ + src/mmc.c \ src/directory.c \ src/fat.c \ *************** *** 28,31 **** --- 29,33 ---- src/io.h \ src/smartmedia.h \ + src/mmc.h \ src/directory.h \ src/fat.h \ |
|
From: Markus G. <ger...@us...> - 2004-05-30 16:29:00
|
Update of /cvsroot/mpio/mpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24870 Modified Files: ChangeLog Log Message: added Roberts MMC code (step 1) Index: ChangeLog =================================================================== RCS file: /cvsroot/mpio/mpio/ChangeLog,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** ChangeLog 30 May 2004 01:46:50 -0000 1.139 --- ChangeLog 30 May 2004 16:28:51 -0000 1.140 *************** *** 1,3 **** --- 1,8 ---- 2004-05-30 Markus Germeier <ma...@tz...> + * added Roberts MMC code (step 1) + * fixed a FAT bug he found on the way + * Thanks and kudos to Robert! + + 2004-05-30 Markus Germeier <ma...@tz...> * changed version to 0.7.1-pre2 |
|
From: Markus G. <ger...@us...> - 2004-05-30 02:08:43
|
Update of /cvsroot/mpio/website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24136 Modified Files: content_install.html news.txt Log Message: 0.7.1-pre2 Index: content_install.html =================================================================== RCS file: /cvsroot/mpio/website/content_install.html,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** content_install.html 25 Mar 2004 23:19:39 -0000 1.14 --- content_install.html 30 May 2004 02:08:33 -0000 1.15 *************** *** 110,119 **** <li>MPIO-DMB+ 128 (128MB on two internal chips, with external memory)</li> <li>MPIO-FD100 256 (256MB on two internal chips, no external memory)</li> ! <li>MPIO-FL100 128 (128MB on one internal chip, <b>NO external memory support!</b>)</li> <li>MPIO-FL100 512 (512MB on two internal chips, <b>NO external memory ! support!</b>), with current CVS snapshot</li> <li>MPIO-FY100 256 (256MB on two internal chips, no external memory)</li> <li>MPIO-FY200 256 (256MB on one internal chips, no external memory)</li> - <li>MPIO-FL100 512 (512MB on two internal chips, no external memory), with current CVS snapshot</li> </ul> <p><b>Beware: </b> There are some very rare versions with 3 internal --- 110,120 ---- <li>MPIO-DMB+ 128 (128MB on two internal chips, with external memory)</li> <li>MPIO-FD100 256 (256MB on two internal chips, no external memory)</li> ! <li>MPIO-FL100 128 (128MB on one internal chip, <b>NO external memory ! support!</b>), with 0.7.1</li> ! <li>MPIO-FL100 256 (256MB on ? internal chips, <b>NO external memory</b>), with 0.7.1</li> <li>MPIO-FL100 512 (512MB on two internal chips, <b>NO external memory ! support!</b>), with 0.7.1</li> <li>MPIO-FY100 256 (256MB on two internal chips, no external memory)</li> <li>MPIO-FY200 256 (256MB on one internal chips, no external memory)</li> </ul> <p><b>Beware: </b> There are some very rare versions with 3 internal Index: news.txt =================================================================== RCS file: /cvsroot/mpio/website/news.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** news.txt 19 Apr 2004 12:57:36 -0000 1.19 --- news.txt 30 May 2004 02:08:33 -0000 1.20 *************** *** 1,2 **** --- 1,14 ---- + 30-May-2004: MPIO 0.7.1-pre2 is out + Hi there, + + the new pre fixes the missing ".so" oddities and some open/close + related bugs. Please give it a <a + href="http://sourceforge.net/project/showfiles.php?group_id=45546&package_id=115801&release_id=242044">try</a>. + + The next steps are to include Roberts MMC code (which is experimental, + but should not break the SmartMedia stuff) und nail down the USB + timeouts some users are reporting. + + --- 19-Apr-2004: MPIO 0.7.1-pre1 is out Long time no release. :-( But here it is: The brand-and-nagel-new |
|
From: Markus G. <ger...@us...> - 2004-05-30 01:47:01
|
Update of /cvsroot/mpio/mpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21631 Modified Files: ChangeLog configure.in Log Message: bumped version to 0.7.1pre2 Index: ChangeLog =================================================================== RCS file: /cvsroot/mpio/mpio/ChangeLog,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** ChangeLog 24 Apr 2004 16:09:57 -0000 1.138 --- ChangeLog 30 May 2004 01:46:50 -0000 1.139 *************** *** 1,2 **** --- 1,5 ---- + 2004-05-30 Markus Germeier <ma...@tz...> + * changed version to 0.7.1-pre2 + 2004-04-24 Markus Germeier <ma...@tz...> * further open/close fixes Index: configure.in =================================================================== RCS file: /cvsroot/mpio/mpio/configure.in,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** configure.in 19 Apr 2004 12:19:19 -0000 1.24 --- configure.in 30 May 2004 01:46:50 -0000 1.25 *************** *** 11,15 **** AC_MSG_RESULT(Building for a ${host} host.) ! AM_INIT_AUTOMAKE(mpio, 0.7.1_pre1-1) dnl build release variable --- 11,15 ---- AC_MSG_RESULT(Building for a ${host} host.) ! AM_INIT_AUTOMAKE(mpio, 0.7.1_pre2-1) dnl build release variable |
|
From: Markus D. <dah...@us...> - 2004-04-25 19:10:48
|
Update of /cvsroot/mpio/kmpio/img In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9648 Modified Files: Makefile.am Added Files: mpio_icon.png Log Message: Added new mpio icon to CVS repository. Thanks to Lance Dial for the nice work. Index: Makefile.am =================================================================== RCS file: /cvsroot/mpio/kmpio/img/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 6 Jun 2003 11:41:15 -0000 1.3 --- Makefile.am 25 Apr 2004 14:50:18 -0000 1.4 *************** *** 1,4 **** IMAGES = button_cancel.png button_ok.png down.png exit.png fileclose.png \ ! kmpio.png up.png filetype_directory.png delete.png folder_new.png dist_pkgdata_DATA = $(IMAGES) --- 1,5 ---- IMAGES = button_cancel.png button_ok.png down.png exit.png fileclose.png \ ! kmpio.png up.png filetype_directory.png delete.png folder_new.png \ ! mpio_icon.png dist_pkgdata_DATA = $(IMAGES) --- NEW FILE: mpio_icon.png --- (This appears to be a binary file; contents omitted.) |
|
From: Markus D. <dah...@us...> - 2004-04-25 15:41:42
|
Update of /cvsroot/mpio/kmpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17663 Modified Files: configure.ac Log Message: - Changed initialisation of configure script using AC_INIT() - The RPM release version can now be configured from configure.ac. Index: configure.ac =================================================================== RCS file: /cvsroot/mpio/kmpio/configure.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configure.ac 25 Apr 2004 15:15:08 -0000 1.9 --- configure.ac 25 Apr 2004 15:37:25 -0000 1.10 *************** *** 1,7 **** dnl Process this file with autoconf to produce a configure script. ! AC_INIT(kmpio/kmpio.cpp) AC_CANONICAL_SYSTEM() AC_MSG_RESULT(Building for a ${host} host.) ! AM_INIT_AUTOMAKE(kmpio, 0.7.1-pre1) dnl Checks for programs. --- 1,14 ---- dnl Process this file with autoconf to produce a configure script. ! AC_INIT(kmpio, 0.7.1_pre1, [dah...@us...]) AC_CANONICAL_SYSTEM() AC_MSG_RESULT(Building for a ${host} host.) ! ! # Release version numbers are configures in the line below. ! RELEASE="1" ! ! # Set the package name ! PACKAGE="$PACKAGE_NAME" ! VERSION="${PACKAGE_VERSION}" ! AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION}) dnl Checks for programs. *************** *** 90,93 **** --- 97,104 ---- AC_SUBST(CXXFLAGS) + AC_SUBST(PACKAGE) + AC_SUBST(VERSION) + AC_SUBST(RELEASE) + AC_OUTPUT([Makefile img/Makefile |
|
From: Markus D. <dah...@us...> - 2004-04-25 15:40:30
|
Update of /cvsroot/mpio/kmpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17563 Modified Files: kmpio.spec.in Log Message: Added new image to RPM spec file. Index: kmpio.spec.in =================================================================== RCS file: /cvsroot/mpio/kmpio/kmpio.spec.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kmpio.spec.in 3 Aug 2003 07:00:56 -0000 1.2 --- kmpio.spec.in 25 Apr 2004 15:36:12 -0000 1.3 *************** *** 1,4 **** %define version @VERSION@ ! %define release 1 %define name kmpio %define prefix /usr --- 1,4 ---- %define version @VERSION@ ! %define release @RELEASE@ %define name kmpio %define prefix /usr *************** *** 47,50 **** --- 47,51 ---- %prefix/share/kmpio/folder_new.png %prefix/share/kmpio/kmpio.png + %prefix/share/kmpio/mpio_icon.png %prefix/share/kmpio/up.png %defattr(755,root,root) *************** *** 57,63 **** %doc NEWS %doc README - - %changelog - * Wed Mar 12 2003 Markus Dahlweid <dah...@us...> - - Initial spec file for kMPIO. - * Added new images --- 58,59 ---- |
|
From: Markus D. <dah...@us...> - 2004-04-25 15:21:10
|
Update of /cvsroot/mpio/kmpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13804 Modified Files: configure.ac Log Message: Updated version to 0.7.1-pre1 Index: configure.ac =================================================================== RCS file: /cvsroot/mpio/kmpio/configure.ac,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure.ac 15 Sep 2003 06:41:29 -0000 1.8 --- configure.ac 25 Apr 2004 15:15:08 -0000 1.9 *************** *** 3,7 **** AC_CANONICAL_SYSTEM() AC_MSG_RESULT(Building for a ${host} host.) ! AM_INIT_AUTOMAKE(kmpio, 0.7.0) dnl Checks for programs. --- 3,7 ---- AC_CANONICAL_SYSTEM() AC_MSG_RESULT(Building for a ${host} host.) ! AM_INIT_AUTOMAKE(kmpio, 0.7.1-pre1) dnl Checks for programs. |
|
From: Markus D. <dah...@us...> - 2004-04-25 15:17:23
|
Update of /cvsroot/mpio/kmpio/kmpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13611 Modified Files: kmpio_aboutbox.cpp kmpio_aboutbox.h Log Message: Added the new icon to the about box. Index: kmpio_aboutbox.cpp =================================================================== RCS file: /cvsroot/mpio/kmpio/kmpio/kmpio_aboutbox.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kmpio_aboutbox.cpp 25 Nov 2003 18:47:33 -0000 1.2 --- kmpio_aboutbox.cpp 25 Apr 2004 15:14:18 -0000 1.3 *************** *** 62,65 **** --- 62,71 ---- QHBoxLayout* MainLayout = new QHBoxLayout( 0, 0, 6 ); + kmpio_icon = new QLabel( this ); + kmpio_icon->setPixmap( load_pixmap( "mpio_icon.png" ) ); + kmpio_icon->setScaledContents( FALSE ); + kmpio_icon->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignLeft ) ); + MainLayout->addWidget( kmpio_icon ); + kmpio_logo = new QLabel( this ); kmpio_logo->setMaximumSize( QSize( 32767, 32767 ) ); Index: kmpio_aboutbox.h =================================================================== RCS file: /cvsroot/mpio/kmpio/kmpio/kmpio_aboutbox.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** kmpio_aboutbox.h 21 Nov 2002 16:37:03 -0000 1.1.1.1 --- kmpio_aboutbox.h 25 Apr 2004 15:14:18 -0000 1.2 *************** *** 44,48 **** protected: ! QLabel *kmpio_version, *kmpio_logo; QPushButton *kmpio_about_close; }; --- 44,48 ---- protected: ! QLabel *kmpio_version, *kmpio_logo, *kmpio_icon; QPushButton *kmpio_about_close; }; |
|
From: Markus D. <dah...@us...> - 2004-04-25 15:12:51
|
Update of /cvsroot/mpio/kmpio/kmpio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12840 Modified Files: kmpio_mainwidget.cpp Log Message: Use new icon for kmpio. Index: kmpio_mainwidget.cpp =================================================================== RCS file: /cvsroot/mpio/kmpio/kmpio/kmpio_mainwidget.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** kmpio_mainwidget.cpp 26 Oct 2003 17:37:58 -0000 1.24 --- kmpio_mainwidget.cpp 25 Apr 2004 15:09:42 -0000 1.25 *************** *** 584,587 **** --- 584,590 ---- readConfiguration(); + // Set application icon + setIcon( load_pixmap( "mpio_icon.png" ) ); + show(); } |
|
From: Markus G. <ger...@us...> - 2004-04-24 16:10:08
|
Update of /cvsroot/mpio/mpio/libmpio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30366/libmpio/src Modified Files: io.c mpio.c Log Message: further open/close fixes Index: mpio.c =================================================================== RCS file: /cvsroot/mpio/mpio/libmpio/src/mpio.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mpio.c 23 Apr 2004 19:21:07 -0000 1.14 --- mpio.c 24 Apr 2004 16:09:58 -0000 1.15 *************** *** 96,102 **** "The selected directory is not empty." }, { MPIO_ERR_DEVICE_NOT_READY, ! "Could not open " MPIO_DEVICE "\n" ! "Verify that the mpio module is loaded and " ! "your MPIO is\nconnected and powered up.\n" }, { MPIO_ERR_OUT_OF_MEMORY, "Out of Memory." }, --- 96,102 ---- "The selected directory is not empty." }, { MPIO_ERR_DEVICE_NOT_READY, ! "Could not access the player\n" ! "Verify that the the player is\n" ! "connected and powered up.\n" }, { MPIO_ERR_OUT_OF_MEMORY, "Out of Memory." }, *************** *** 315,323 **** --- 315,326 ---- if (!new_mpio) { debug ("Error allocating memory for mpio_t"); + _mpio_errno = MPIO_ERR_OUT_OF_MEMORY; return NULL; } memset(new_mpio, 0, sizeof(mpio_t)); + new_mpio->fd=0; if (mpio_device_open(new_mpio) != MPIO_OK) { + free(new_mpio); _mpio_errno = MPIO_ERR_DEVICE_NOT_READY; return NULL; Index: io.c =================================================================== RCS file: /cvsroot/mpio/mpio/libmpio/src/io.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** io.c 23 Apr 2004 18:17:56 -0000 1.11 --- io.c 24 Apr 2004 16:09:58 -0000 1.12 *************** *** 512,515 **** --- 512,518 ---- m->use_libusb=1; + if (m->fd) + return MPIO_OK; + #ifdef USE_KMODULE debugn(2, "trying kernel module\n"); *************** *** 550,553 **** --- 553,557 ---- { debugn(2, "Error claiming device: %d \"%s\"\n", ret, usb_strerror()); + usb_close(m->usb_handle); return MPIO_ERR_PERMISSION_DENIED; } else { *************** *** 555,559 **** } - interface = dev->config->interface->altsetting; --- 559,562 ---- *************** *** 573,578 **** --- 576,583 ---- } + m->fd=1; if (!(m->usb_in_ep && m->usb_out_ep)) { debugn(2, "Did not find USB bulk endpoints.\n"); + mpio_device_close(m); return MPIO_ERR_PERMISSION_DENIED; } *************** *** 584,588 **** } } ! return MPIO_ERR_PERMISSION_DENIED; } --- 589,595 ---- } } ! ! if (m->usb_handle) ! usb_close(m->usb_handle); return MPIO_ERR_PERMISSION_DENIED; } *************** *** 591,603 **** mpio_device_close(mpio_t *m) { if(m->use_libusb) { ! debugn(2, "closing libusb\n"); ! usb_close(m->usb_handle); ! m->fd=0; } #ifdef USE_KMODULE else { ! debugn(2, "closing kernel module\n"); ! close(m->fd); ! m->fd=0; } #endif --- 598,614 ---- mpio_device_close(mpio_t *m) { if(m->use_libusb) { ! if (m->fd) { ! debugn(2, "closing libusb\n"); ! usb_close(m->usb_handle); ! m->fd=0; ! } } #ifdef USE_KMODULE else { ! if (m->fd) { ! debugn(2, "closing kernel module\n"); ! close(m->fd); ! m->fd=0; ! } } #endif |
