Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-05-29 04:41:27 +00:00
Code Issues Projects Releases Wiki Activity

to remove warning on signedness with gcc 4, cast some parameters

Browse Source
This commit is contained in:
Laurent Vivier 2007-02-24 14:02:40 +00:00
parent 7be7cf61df
commit 09423e7e90
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/emile-first-tune.c
View File

@ -136,7 +136,7 @@ int first_tune_scsi( char* image, int drive_num, int second_offset, int size)
printf("ERROR: cannot read bootblock\n");
return 1;
}
if ( strncmp( firstBlock.boot_block_header.SysName+1,
if ( strncmp( (char*)firstBlock.boot_block_header.SysName+1,
"Mac Bootloader", 14) != 0 )
{
printf("ERROR: not an EMILE bootblock\n");

6
tools/emile-map-set.c
View File

@ -73,7 +73,7 @@ static int get_driver(emile_map_t *map, int partition, char* appledriver)
int partition_base, partition_size;
int bootstart, bootsize, bootaddr, bootentry, checksum;
char processor[16];
char *code;
unsigned char *code;
int fd;
int ret;
@ -146,7 +146,7 @@ static int get_driver(emile_map_t *map, int partition, char* appledriver)
return -1;
}
code = (char*)malloc(partition_size * 512);
code = (unsigned char*)malloc(partition_size * 512);
if (code == NULL)
{
fprintf(stderr, "ERROR: cannot malloc() to load driver in memory\n");
@ -212,7 +212,7 @@ static int put_driver(emile_map_t *map, int partition, char* appledriver)
int block_size, block_count;
int fd;
int ret;
char* code;
unsigned char* code;
struct stat st;
int driver_number;
int block, count, checksum;

50
tools/emile-mkisofs.c
View File

@ -87,7 +87,7 @@ static int create_apple_driver(char *temp, char *appledriver, char *first_level)
FILE* fd;
int fd_driver;
char *buffer;
char *driver;
unsigned char *driver;
int ret;
struct stat st;
@ -121,27 +121,27 @@ static int create_apple_driver(char *temp, char *appledriver, char *first_level)
memset(&block0, 0, sizeof(block0));
write_short(&block0.Sig, DD_SIGNATURE);
write_short(&block0.BlkSize, BLOCKSIZE);
write_long(&block0.BlkCount, 0); // set by mkisofs
write_short(&block0.DevType, 1);
write_short(&block0.DevId, 1);
write_long(&block0.Data, 0);
write_short(&block0.DrvrCount, 1);
write_short((u_int16_t*)&block0.Sig, DD_SIGNATURE);
write_short((u_int16_t*)&block0.BlkSize, BLOCKSIZE);
write_long((u_int32_t*)&block0.BlkCount, 0); // set by mkisofs
write_short((u_int16_t*)&block0.DevType, 1);
write_short((u_int16_t*)&block0.DevId, 1);
write_long((u_int32_t*)&block0.Data, 0);
write_short((u_int16_t*)&block0.DrvrCount, 1);
write_long(&block0.DrvInfo[0].Block, 0);
write_short(&block0.DrvInfo[0].Size, (DRIVER_SIZE + BLOCKSIZE - 1) / BLOCKSIZE);
write_short(&block0.DrvInfo[0].Type, kDriverTypeMacSCSI);
write_long((u_int32_t*)&block0.DrvInfo[0].Block, 0);
write_short((u_int16_t*)&block0.DrvInfo[0].Size, (DRIVER_SIZE + BLOCKSIZE - 1) / BLOCKSIZE);
write_short((u_int16_t*)&block0.DrvInfo[0].Type, kDriverTypeMacSCSI);
memset(&map512, 0, sizeof(map512));
write_short(&map512.Sig, MAP_SIGNATURE);
write_long(&map512.PartBlkCnt, (DRIVER_SIZE + 512 - 1) / 512);
write_long(&map512.PyPartStart,0);
write_short((u_int16_t*)&map512.Sig, MAP_SIGNATURE);
write_long((u_int32_t*)&map512.PartBlkCnt, (DRIVER_SIZE + 512 - 1) / 512);
write_long((u_int32_t*)&map512.PyPartStart,0);
strncpy(map512.PartName, "Macintosh", 32);
strncpy(map512.PartType, APPLE_DRIVER43, 32);
write_long(&map512.LgDataStart, 0);
write_long(&map512.DataCnt, 0);
write_long(&map512.PartStatus, kPartitionAUXIsValid |
write_long((u_int32_t*)&map512.LgDataStart, 0);
write_long((u_int32_t*)&map512.DataCnt, 0);
write_long((u_int32_t*)&map512.PartStatus, kPartitionAUXIsValid |
kPartitionAUXIsAllocated |
kPartitionAUXIsInUse |
kPartitionAUXIsBootValid |
@ -150,18 +150,18 @@ static int create_apple_driver(char *temp, char *appledriver, char *first_level)
kPartitionAUXIsBootCodePositionIndependent |
kPartitionIsChainCompatible |
kPartitionIsRealDeviceDriver);
write_long(&map512.LgBootStart, 0);
write_long(&map512.BootSize, st.st_size);
write_long(&map512.BootAddr, 0);
write_long(&map512.BootAddr2, 0);
write_long(&map512.BootEntry, 0);
write_long(&map512.BootEntry2, 0);
write_long(&map512.BootCksum, emile_checksum(driver, st.st_size));
write_long((u_int32_t*)&map512.LgBootStart, 0);
write_long((u_int32_t*)&map512.BootSize, st.st_size);
write_long((u_int32_t*)&map512.BootAddr, 0);
write_long((u_int32_t*)&map512.BootAddr2, 0);
write_long((u_int32_t*)&map512.BootEntry, 0);
write_long((u_int32_t*)&map512.BootEntry2, 0);
write_long((u_int32_t*)&map512.BootCksum, emile_checksum(driver, st.st_size));
strncpy(map512.Processor, "68000", 16);
write_long((u_int32_t*)map512.Pad, kSCSICDDriverSignature);
map2048 = map512;
write_long(&map2048.PartBlkCnt, (DRIVER_SIZE + BLOCKSIZE - 1) / BLOCKSIZE);
write_long((u_int32_t*)&map2048.PartBlkCnt, (DRIVER_SIZE + BLOCKSIZE - 1) / BLOCKSIZE);
strcpy(temp, "/tmp/emile-mkisofs-XXXXXX");
mkstemp(temp);

2
tools/emile.c
View File

@ -702,7 +702,7 @@ int main(int argc, char **argv)
if ((action & ACTION_TEST) == 0)
{
struct emile_container *container;
short unit_id;
unsigned short unit_id;
char map_info[64];
int drive, second, size;