Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cpc2cdt: Added parameter to skip header check #156

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

cpc2cdt: Added parameter to skip header check #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions cpctelera/tools/cpc2cdt/src/cpc2cdt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ FILE *fi,*fo;
char *si=0,*so=0,*sn=0,*mode=0;

int flag_n=0,flag_b=1000,flag_bb,flag_m=0,flag_i=255,flag_o=4096,flag_t=0,flag_h=2560,flag_p=10240,flag_z=4;
int filetype=0,filesize=0,fileload=-1,fileboot=-1,pulselength=-1,bitspersec=-1,bytesperpage=-1,bitsize,detectedHeader=0;
int filetype=0,filesize=0,fileload=-1,fileboot=-1,pulselength=-1,bitspersec=-1,bytesperpage=-1,bitsize,detectedHeader=0,skipHeaderCheck=0;

int i,j,k,status=0;

Expand Down Expand Up @@ -185,6 +185,7 @@ void usage() {
"\n -p N pause after the final block, in milliseconds (Default 10240)"
"\n -l N load address (Default 16384)"
"\n -x N run/execute address (Default 16384)"
"\n -s skip header detection"
"\n"
"\nSPECIFIC OPTIONS FOR TINY MODES"
"\n -rl N length of a single pulse (half) in Ts (1T=1/3500000s)"
Expand Down Expand Up @@ -292,6 +293,7 @@ void parseCommandLineArgs(int argc, char *argv[]) {
else if ( flag("-z") ) { get16bitFlag(flag_z, "-z"); }
else if ( flag("-l") ) { get16bitFlag(fileload, "-l"); }
else if ( flag("-x") ) { get16bitFlag(fileboot, "-x"); }
else if ( flag("-s") ) { skipHeaderCheck=1; }
else if ( flag("-rl") ) { get16bitFlag(pulselength, "-rl"); }
else if ( flag("-rb") ) { get16bitFlag(bitspersec, "-rb"); }
else if ( flag("-rp") ) { get16bitFlag(bytesperpage, "-rp"); }
Expand Down Expand Up @@ -327,23 +329,25 @@ void detectHeaderInInputFile() {
i=j=0;
while (i<0x43)
j+=body[i++];
if ((body[0x43]+256*body[0x44])==j) { // AMSDOS!
filetype=body[0x12];
filesize=body[0x40]+body[0x41]*256;
fileload=body[0x15]+body[0x16]*256;
fileboot=body[0x1A]+body[0x1B]*256;
if (fread(body,1,filesize,fi)<1) error(1, "ERROR: short read while reading AMSDOS header");
detectedHeader = 1;
} else {
while (i<0x7F)
j+=body[i++];
if ((j&0xFF)==body[0x7F]) { // PLUS3DOS!
filetype=body[0x0F];
filesize=body[0x10]+body[0x11]*256;
fileload=body[0x12]+body[0x13]*256;
fileboot=body[0x14]+body[0x15]*256;
if (fread(body,1,filesize,fi)<1) error(1, "ERROR: short read while reading PLUS3DOS header");
if (skipHeaderCheck==0) {
if (((body[0x43]+256*body[0x44])==j)&&(j!=0)) { // AMSDOS!
filetype=body[0x12];
filesize=body[0x40]+body[0x41]*256;
fileload=body[0x15]+body[0x16]*256;
fileboot=body[0x1A]+body[0x1B]*256;
if (fread(body,1,filesize,fi)<1) error(1, "ERROR: short read while reading AMSDOS header");
detectedHeader = 1;
} else {
while (i<0x7F)
j+=body[i++];
if ((j&0xFF)==body[0x7F]) { // PLUS3DOS!
filetype=body[0x0F];
filesize=body[0x10]+body[0x11]*256;
fileload=body[0x12]+body[0x13]*256;
fileboot=body[0x14]+body[0x15]*256;
if (fread(body,1,filesize,fi)<1) error(1, "ERROR: short read while reading PLUS3DOS header");
detectedHeader = 1;
}
}
}
}
Expand Down