Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-03-04 04:30:18 +00:00
Code Issues Projects Releases Wiki Activity

prodos: fix up mkprodosfs so it can create 2mg files

Browse Source
This commit is contained in:
Vince Weaver 2024-07-16 02:08:56 -04:00
parent 99c3070717
commit b2c41d2927
3 changed files with 75 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
utils/prodos-utils/mkprodosfs.c
View File

@ -28,6 +28,7 @@ static void usage(char *binary,int help) {
printf("\t-i interleave : PRODOS (default) or DOS33\n");
printf("\t-s filename : bootsector\n");
printf("\t-n volume : volume name\n");
printf("\t-2 : prepend a 2mg header\n");
printf("\n\n");
}
exit(0);
@ -48,13 +49,15 @@ int main(int argc, char **argv) {
int volname_len;
int interleave=PRODOS_INTERLEAVE_PRODOS;
int num_voldirs=4,num_bitmaps,num_bitmap_blocks,ones_to_write;
int make_2mg_header=0;
char header_2mg[64];
strncpy(volname,"EMPTY",6);
volname_len=strlen(volname);
/* Parse Command Line Arguments */
while ((c = getopt (argc, argv,"b:i:s:n:hv"))!=-1) {
while ((c = getopt (argc, argv,"b:i:s:n:hv2"))!=-1) {
switch (c) {
case 'b':
num_blocks=strtol(optarg,&endptr,10);
@ -83,8 +86,11 @@ int main(int argc, char **argv) {
}
memcpy(volname,optarg,volname_len);
break;
case '2': make_2mg_header=1;
break;
case 'v': usage(argv[0],0);
case 'h': usage(argv[0],1);
}
}
@ -100,13 +106,13 @@ int main(int argc, char **argv) {
/***********************/
/* sectors: 2->32 (limited by 4-byte bitfields) */
if ((num_blocks<6) || (num_blocks>65536)) {
printf("Number of blocks must be >2 and <65536\n\n");
if ((num_blocks<6) || (num_blocks>65535)) {
printf("Number of blocks must be >6 and <65536\n\n");
goto end_of_program;
}
/* Open device */
fd=open(device,O_RDWR|O_CREAT,0666);
fd=open(device,O_RDWR|O_CREAT|O_TRUNC,0666);
if (fd<0) {
fprintf(stderr,"Error opening %s (%s)\n",
device,strerror(errno));
@ -122,7 +128,63 @@ int main(int argc, char **argv) {
voldir.fd=fd;
voldir.interleave=interleave;
voldir.image_offset=0;
if (make_2mg_header) {
memset(header_2mg,0,64);
header_2mg[0]='2';
header_2mg[1]='I';
header_2mg[2]='M';
header_2mg[3]='G';
header_2mg[4]='V';
header_2mg[5]='M';
header_2mg[6]='W';
header_2mg[7]='!';
header_2mg[8]=0x40; /* header size (64 bytes) */
header_2mg[9]=0x00;
header_2mg[10]=1;
header_2mg[11]=0; /* version number */
header_2mg[12]=1; /* prodos sector order */
header_2mg[13]=0;
header_2mg[14]=0;
header_2mg[15]=0;
header_2mg[16]=0; /* flags */
header_2mg[17]=0; /* flags */
header_2mg[18]=0; /* flags */
header_2mg[19]=0; /* flags */
header_2mg[20]=num_blocks%256; /* prodos blocks */
header_2mg[21]=num_blocks/256;
header_2mg[22]=0;
header_2mg[23]=0;
header_2mg[24]=0x40; /* offset to disk data */
header_2mg[25]=0;
header_2mg[26]=0;
header_2mg[27]=0;
int data_bytes=num_blocks*512;
/* bytes of disk data */
header_2mg[28]=(data_bytes&0xff);
header_2mg[29]=(data_bytes>>8)&0xff;
header_2mg[30]=(data_bytes>>16)&0xff;
header_2mg[31]=(data_bytes>>24)&0xff;
/* we don't set any of the additional fields */
write(fd,header_2mg,64);
voldir.image_offset=64;
}
else {
voldir.image_offset=0;
}
voldir.storage_type=PRODOS_FILE_VOLUME_HDR;
voldir.name_length=volname_len;
memcpy(voldir.volume_name,volname,volname_len);
@ -154,10 +216,8 @@ int main(int argc, char **argv) {
fprintf(stderr,"Error writing!\n");
return -1;
}
}
/*********************************/
/* create the voldirs */
/*********************************/

9
utils/prodos-utils/prodos.c
View File

@ -1166,7 +1166,7 @@ int main(int argc, char **argv) {
/* FIXME: detect this based on magic number */
else if (!strncmp(&image[strlen(image)-4],".2mg",4)) {
char header[64];
unsigned char header[64];
int image_format;
read(prodos_fd,header,64);
@ -1217,11 +1217,14 @@ int main(int argc, char **argv) {
(header[18]<<16)|
(header[19]<<24));
printf("ProDOS blocks: $%X\n",
int prodos_blocks=
(header[20])|
(header[21]<<8)|
(header[22]<<16)|
(header[23]<<24));
(header[23]<<24);
printf("ProDOS blocks: $%X (%d)\n",
prodos_blocks,prodos_blocks);
printf("Image offset: $%X\n",image_offset);

3
utils/prodos-utils/prodos_voldir.c
View File

@ -31,7 +31,8 @@ int prodos_read_voldir(struct voldir_t *voldir) {
voldir->storage_type=(voldir_buffer[0x4]>>4)&0xf;
voldir->name_length=(voldir_buffer[0x4]&0xf);
if (voldir->storage_type!=0xf) {
fprintf(stderr,"ERROR! Expected storage type F\n");
fprintf(stderr,"ERROR! Expected storage type F, we found %x\n",
voldir->storage_type);
}
memcpy(voldir->volume_name,&voldir_buffer[0x5],voldir->name_length);