DISK: Remove $ from all variable names for clean compiles on all gcc versions
This commit is contained in:
Mark Pizzolato
parent
b98ece819b
commit
9a69fa8b49
1 changed files with 129 additions and 129 deletions
258
sim_disk.c
258
sim_disk.c
|
|
@ -840,128 +840,128 @@ return stat;
|
|||
#pragma pack(push,1)
|
||||
typedef struct _ODS2_HomeBlock
|
||||
{
|
||||
uint32 hm2$l_homelbn;
|
||||
uint32 hm2$l_alhomelbn;
|
||||
uint32 hm2$l_altidxlbn;
|
||||
uint8 hm2$b_strucver;
|
||||
uint8 hm2$b_struclev;
|
||||
uint16 hm2$w_cluster;
|
||||
uint16 hm2$w_homevbn;
|
||||
uint16 hm2$w_alhomevbn;
|
||||
uint16 hm2$w_altidxvbn;
|
||||
uint16 hm2$w_ibmapvbn;
|
||||
uint32 hm2$l_ibmaplbn;
|
||||
uint32 hm2$l_maxfiles;
|
||||
uint16 hm2$w_ibmapsize;
|
||||
uint16 hm2$w_resfiles;
|
||||
uint16 hm2$w_devtype;
|
||||
uint16 hm2$w_rvn;
|
||||
uint16 hm2$w_setcount;
|
||||
uint16 hm2$w_volchar;
|
||||
uint32 hm2$l_volowner;
|
||||
uint32 hm2$l_reserved;
|
||||
uint16 hm2$w_protect;
|
||||
uint16 hm2$w_fileprot;
|
||||
uint16 hm2$w_reserved;
|
||||
uint16 hm2$w_checksum1;
|
||||
uint32 hm2$q_credate[2];
|
||||
uint8 hm2$b_window;
|
||||
uint8 hm2$b_lru_lim;
|
||||
uint16 hm2$w_extend;
|
||||
uint32 hm2$q_retainmin[2];
|
||||
uint32 hm2$q_retainmax[2];
|
||||
uint32 hm2$q_revdate[2];
|
||||
uint8 hm2$r_min_class[20];
|
||||
uint8 hm2$r_max_class[20];
|
||||
uint8 hm2$r_reserved[320];
|
||||
uint32 hm2$l_serialnum;
|
||||
uint8 hm2$t_strucname[12];
|
||||
uint8 hm2$t_volname[12];
|
||||
uint8 hm2$t_ownername[12];
|
||||
uint8 hm2$t_format[12];
|
||||
uint16 hm2$w_reserved2;
|
||||
uint16 hm2$w_checksum2;
|
||||
uint32 hm2_l_homelbn;
|
||||
uint32 hm2_l_alhomelbn;
|
||||
uint32 hm2_l_altidxlbn;
|
||||
uint8 hm2_b_strucver;
|
||||
uint8 hm2_b_struclev;
|
||||
uint16 hm2_w_cluster;
|
||||
uint16 hm2_w_homevbn;
|
||||
uint16 hm2_w_alhomevbn;
|
||||
uint16 hm2_w_altidxvbn;
|
||||
uint16 hm2_w_ibmapvbn;
|
||||
uint32 hm2_l_ibmaplbn;
|
||||
uint32 hm2_l_maxfiles;
|
||||
uint16 hm2_w_ibmapsize;
|
||||
uint16 hm2_w_resfiles;
|
||||
uint16 hm2_w_devtype;
|
||||
uint16 hm2_w_rvn;
|
||||
uint16 hm2_w_setcount;
|
||||
uint16 hm2_w_volchar;
|
||||
uint32 hm2_l_volowner;
|
||||
uint32 hm2_l_reserved;
|
||||
uint16 hm2_w_protect;
|
||||
uint16 hm2_w_fileprot;
|
||||
uint16 hm2_w_reserved;
|
||||
uint16 hm2_w_checksum1;
|
||||
uint32 hm2_q_credate[2];
|
||||
uint8 hm2_b_window;
|
||||
uint8 hm2_b_lru_lim;
|
||||
uint16 hm2_w_extend;
|
||||
uint32 hm2_q_retainmin[2];
|
||||
uint32 hm2_q_retainmax[2];
|
||||
uint32 hm2_q_revdate[2];
|
||||
uint8 hm2_r_min_class[20];
|
||||
uint8 hm2_r_max_class[20];
|
||||
uint8 hm2_r_reserved[320];
|
||||
uint32 hm2_l_serialnum;
|
||||
uint8 hm2_t_strucname[12];
|
||||
uint8 hm2_t_volname[12];
|
||||
uint8 hm2_t_ownername[12];
|
||||
uint8 hm2_t_format[12];
|
||||
uint16 hm2_w_reserved2;
|
||||
uint16 hm2_w_checksum2;
|
||||
} ODS2_HomeBlock;
|
||||
|
||||
typedef struct _ODS2_FileHeader
|
||||
{
|
||||
uint8 fh2$b_idoffset;
|
||||
uint8 fh2$b_mpoffset;
|
||||
uint8 fh2$b_acoffset;
|
||||
uint8 fh2$b_rsoffset;
|
||||
uint16 fh2$w_seg_num;
|
||||
uint16 fh2$w_structlev;
|
||||
uint16 fh2$w_fid[3];
|
||||
uint16 fh2$w_ext_fid[3];
|
||||
uint16 fh2$w_recattr[16];
|
||||
uint32 fh2$l_filechar;
|
||||
uint16 fh2$w_remaining[228];
|
||||
uint8 fh2_b_idoffset;
|
||||
uint8 fh2_b_mpoffset;
|
||||
uint8 fh2_b_acoffset;
|
||||
uint8 fh2_b_rsoffset;
|
||||
uint16 fh2_w_seg_num;
|
||||
uint16 fh2_w_structlev;
|
||||
uint16 fh2_w_fid[3];
|
||||
uint16 fh2_w_ext_fid[3];
|
||||
uint16 fh2_w_recattr[16];
|
||||
uint32 fh2_l_filechar;
|
||||
uint16 fh2_w_remaining[228];
|
||||
} ODS2_FileHeader;
|
||||
|
||||
typedef union _ODS2_Retreval
|
||||
{
|
||||
struct
|
||||
{
|
||||
unsigned fm2$$_fill : 14; /* type specific data */
|
||||
unsigned fm2$v_format : 2; /* format type code */
|
||||
} fm2$r_word0_bits;
|
||||
unsigned fm2___fill : 14; /* type specific data */
|
||||
unsigned fm2_v_format : 2; /* format type code */
|
||||
} fm2_r_word0_bits;
|
||||
struct
|
||||
{
|
||||
unsigned fm2$v_exact : 1; /* exact placement specified */
|
||||
unsigned fm2$v_oncyl : 1; /* on cylinder allocation desired */
|
||||
unsigned fm2$$_fill : 10;
|
||||
unsigned fm2$v_lbn : 1; /* use LBN of next map pointer */
|
||||
unsigned fm2$v_rvn : 1; /* place on specified RVN */
|
||||
unsigned fm2$v_format0 : 2;
|
||||
} fm2$r_map_bits0;
|
||||
unsigned fm2_v_exact : 1; /* exact placement specified */
|
||||
unsigned fm2_v_oncyl : 1; /* on cylinder allocation desired */
|
||||
unsigned fm2___fill : 10;
|
||||
unsigned fm2_v_lbn : 1; /* use LBN of next map pointer */
|
||||
unsigned fm2_v_rvn : 1; /* place on specified RVN */
|
||||
unsigned fm2_v_format0 : 2;
|
||||
} fm2_r_map_bits0;
|
||||
struct
|
||||
{
|
||||
unsigned fm2$b_count1 : 8; /* low byte described below */
|
||||
unsigned fm2$v_highlbn1 : 6; /* high order LBN */
|
||||
unsigned fm2$v_format1 : 2;
|
||||
unsigned fm2$w_lowlbn1 : 16; /* low order LBN */
|
||||
} fm2$r_map_bits1;
|
||||
unsigned fm2_b_count1 : 8; /* low byte described below */
|
||||
unsigned fm2_v_highlbn1 : 6; /* high order LBN */
|
||||
unsigned fm2_v_format1 : 2;
|
||||
unsigned fm2_w_lowlbn1 : 16; /* low order LBN */
|
||||
} fm2_r_map_bits1;
|
||||
struct
|
||||
{
|
||||
struct
|
||||
{
|
||||
unsigned fm2$v_count2 : 14; /* count field */
|
||||
unsigned fm2$v_format2 : 2;
|
||||
unsigned fm2$l_lowlbn2 : 16; /* low order LBN */
|
||||
} fm2$r_map2_long0;
|
||||
uint16 fm2$l_highlbn2; /* high order LBN */
|
||||
} fm2$r_map_bits2;
|
||||
unsigned fm2_v_count2 : 14; /* count field */
|
||||
unsigned fm2_v_format2 : 2;
|
||||
unsigned fm2_l_lowlbn2 : 16; /* low order LBN */
|
||||
} fm2_r_map2_long0;
|
||||
uint16 fm2_l_highlbn2; /* high order LBN */
|
||||
} fm2_r_map_bits2;
|
||||
struct
|
||||
{
|
||||
struct
|
||||
{
|
||||
unsigned fm2$v_highcount3 : 14; /* low order count field */
|
||||
unsigned fm2$v_format3 : 2;
|
||||
unsigned fm2$w_lowcount3 : 16; /* high order count field */
|
||||
} fm2$r_map3_long0;
|
||||
uint32 fm2$l_lbn3;
|
||||
} fm2$r_map_bits3;
|
||||
unsigned fm2_v_highcount3 : 14; /* low order count field */
|
||||
unsigned fm2_v_format3 : 2;
|
||||
unsigned fm2_w_lowcount3 : 16; /* high order count field */
|
||||
} fm2_r_map3_long0;
|
||||
uint32 fm2_l_lbn3;
|
||||
} fm2_r_map_bits3;
|
||||
} ODS2_Retreval;
|
||||
|
||||
typedef struct _ODS2_StorageControlBlock
|
||||
{
|
||||
uint8 scb$b_strucver; /* 1 */
|
||||
uint8 scb$b_struclev; /* 2 */
|
||||
uint16 scb$w_cluster;
|
||||
uint32 scb$l_volsize;
|
||||
uint32 scb$l_blksize;
|
||||
uint32 scb$l_sectors;
|
||||
uint32 scb$l_tracks;
|
||||
uint32 scb$l_cylinder;
|
||||
uint32 scb$l_status;
|
||||
uint32 scb$l_status2;
|
||||
uint16 scb$w_writecnt;
|
||||
uint8 scb$t_volockname[12];
|
||||
uint32 scb$q_mounttime[2];
|
||||
uint16 scb$w_backrev;
|
||||
uint32 scb$q_genernum[2];
|
||||
uint8 scb$b_reserved[446];
|
||||
uint16 scb$w_checksum;
|
||||
uint8 scb_b_strucver; /* 1 */
|
||||
uint8 scb_b_struclev; /* 2 */
|
||||
uint16 scb_w_cluster;
|
||||
uint32 scb_l_volsize;
|
||||
uint32 scb_l_blksize;
|
||||
uint32 scb_l_sectors;
|
||||
uint32 scb_l_tracks;
|
||||
uint32 scb_l_cylinder;
|
||||
uint32 scb_l_status;
|
||||
uint32 scb_l_status2;
|
||||
uint16 scb_w_writecnt;
|
||||
uint8 scb_t_volockname[12];
|
||||
uint32 scb_q_mounttime[2];
|
||||
uint16 scb_w_backrev;
|
||||
uint32 scb_q_genernum[2];
|
||||
uint8 scb_b_reserved[446];
|
||||
uint16 scb_w_checksum;
|
||||
} ODS2_SCB;
|
||||
#pragma pack(pop)
|
||||
|
||||
|
|
@ -1000,62 +1000,62 @@ saved_capac = uptr->capac;
|
|||
uptr->capac = (t_addr)(temp_capac/(capac_factor*((dptr->flags & DEV_SECTORS) ? 512 : 1)));
|
||||
if (sim_disk_rdsect (uptr, 1, (uint8 *)&Home, NULL, 1))
|
||||
goto Return_Cleanup;
|
||||
CheckSum1 = ODS2Checksum (&Home, (uint16)((((char *)&Home.hm2$w_checksum1)-((char *)&Home.hm2$l_homelbn))/2));
|
||||
CheckSum2 = ODS2Checksum (&Home, (uint16)((((char *)&Home.hm2$w_checksum2)-((char *)&Home.hm2$l_homelbn))/2));
|
||||
if ((Home.hm2$l_homelbn == 0) ||
|
||||
(Home.hm2$l_alhomelbn == 0) ||
|
||||
(Home.hm2$l_altidxlbn == 0) ||
|
||||
((Home.hm2$b_struclev != 2) && (Home.hm2$b_struclev != 5)) ||
|
||||
(Home.hm2$b_strucver == 0) ||
|
||||
(Home.hm2$w_cluster == 0) ||
|
||||
(Home.hm2$w_homevbn == 0) ||
|
||||
(Home.hm2$w_alhomevbn == 0) ||
|
||||
(Home.hm2$w_ibmapvbn == 0) ||
|
||||
(Home.hm2$l_ibmaplbn == 0) ||
|
||||
(Home.hm2$w_resfiles >= Home.hm2$l_maxfiles) ||
|
||||
(Home.hm2$w_ibmapsize == 0) ||
|
||||
(Home.hm2$w_resfiles < 5) ||
|
||||
(Home.hm2$w_checksum1 != CheckSum1) ||
|
||||
(Home.hm2$w_checksum2 != CheckSum2))
|
||||
CheckSum1 = ODS2Checksum (&Home, (uint16)((((char *)&Home.hm2_w_checksum1)-((char *)&Home.hm2_l_homelbn))/2));
|
||||
CheckSum2 = ODS2Checksum (&Home, (uint16)((((char *)&Home.hm2_w_checksum2)-((char *)&Home.hm2_l_homelbn))/2));
|
||||
if ((Home.hm2_l_homelbn == 0) ||
|
||||
(Home.hm2_l_alhomelbn == 0) ||
|
||||
(Home.hm2_l_altidxlbn == 0) ||
|
||||
((Home.hm2_b_struclev != 2) && (Home.hm2_b_struclev != 5)) ||
|
||||
(Home.hm2_b_strucver == 0) ||
|
||||
(Home.hm2_w_cluster == 0) ||
|
||||
(Home.hm2_w_homevbn == 0) ||
|
||||
(Home.hm2_w_alhomevbn == 0) ||
|
||||
(Home.hm2_w_ibmapvbn == 0) ||
|
||||
(Home.hm2_l_ibmaplbn == 0) ||
|
||||
(Home.hm2_w_resfiles >= Home.hm2_l_maxfiles) ||
|
||||
(Home.hm2_w_ibmapsize == 0) ||
|
||||
(Home.hm2_w_resfiles < 5) ||
|
||||
(Home.hm2_w_checksum1 != CheckSum1) ||
|
||||
(Home.hm2_w_checksum2 != CheckSum2))
|
||||
goto Return_Cleanup;
|
||||
if (sim_disk_rdsect (uptr, Home.hm2$l_ibmaplbn+Home.hm2$w_ibmapsize+1, (uint8 *)&Header, NULL, 1))
|
||||
if (sim_disk_rdsect (uptr, Home.hm2_l_ibmaplbn+Home.hm2_w_ibmapsize+1, (uint8 *)&Header, NULL, 1))
|
||||
goto Return_Cleanup;
|
||||
CheckSum1 = ODS2Checksum (&Header, 255);
|
||||
if (CheckSum1 != *(((uint16 *)&Header)+255)) /* Verify Checksum on BITMAP.SYS file header */
|
||||
goto Return_Cleanup;
|
||||
Retr = (ODS2_Retreval *)(((uint16*)(&Header))+Header.fh2$b_mpoffset);
|
||||
Retr = (ODS2_Retreval *)(((uint16*)(&Header))+Header.fh2_b_mpoffset);
|
||||
/* The BitMap File has a single extent, which may be preceeded by a placement descriptor */
|
||||
if (Retr->fm2$r_word0_bits.fm2$v_format == 0)
|
||||
if (Retr->fm2_r_word0_bits.fm2_v_format == 0)
|
||||
Retr = (ODS2_Retreval *)(((uint16 *)Retr)+1); /* skip placement descriptor */
|
||||
switch (Retr->fm2$r_word0_bits.fm2$v_format)
|
||||
switch (Retr->fm2_r_word0_bits.fm2_v_format)
|
||||
{
|
||||
case 1:
|
||||
ScbLbn = (Retr->fm2$r_map_bits1.fm2$v_highlbn1<<16)+Retr->fm2$r_map_bits1.fm2$w_lowlbn1;
|
||||
ScbLbn = (Retr->fm2_r_map_bits1.fm2_v_highlbn1<<16)+Retr->fm2_r_map_bits1.fm2_w_lowlbn1;
|
||||
break;
|
||||
case 2:
|
||||
ScbLbn = (Retr->fm2$r_map_bits2.fm2$l_highlbn2<<16)+Retr->fm2$r_map_bits2.fm2$r_map2_long0.fm2$l_lowlbn2;
|
||||
ScbLbn = (Retr->fm2_r_map_bits2.fm2_l_highlbn2<<16)+Retr->fm2_r_map_bits2.fm2_r_map2_long0.fm2_l_lowlbn2;
|
||||
break;
|
||||
case 3:
|
||||
ScbLbn = Retr->fm2$r_map_bits3.fm2$l_lbn3;
|
||||
ScbLbn = Retr->fm2_r_map_bits3.fm2_l_lbn3;
|
||||
break;
|
||||
}
|
||||
Retr = (ODS2_Retreval *)(((uint16 *)Retr)+Retr->fm2$r_word0_bits.fm2$v_format+1);
|
||||
Retr = (ODS2_Retreval *)(((uint16 *)Retr)+Retr->fm2_r_word0_bits.fm2_v_format+1);
|
||||
if (sim_disk_rdsect (uptr, ScbLbn, (uint8 *)&Scb, NULL, 1))
|
||||
goto Return_Cleanup;
|
||||
CheckSum1 = ODS2Checksum (&Scb, 255);
|
||||
if (CheckSum1 != *(((uint16 *)&Scb)+255)) /* Verify Checksum on Storage Control Block */
|
||||
goto Return_Cleanup;
|
||||
if ((Scb.scb$w_cluster != Home.hm2$w_cluster) ||
|
||||
(Scb.scb$b_strucver != Home.hm2$b_strucver) ||
|
||||
(Scb.scb$b_struclev != Home.hm2$b_struclev))
|
||||
if ((Scb.scb_w_cluster != Home.hm2_w_cluster) ||
|
||||
(Scb.scb_b_strucver != Home.hm2_b_strucver) ||
|
||||
(Scb.scb_b_struclev != Home.hm2_b_struclev))
|
||||
goto Return_Cleanup;
|
||||
if (!sim_quiet) {
|
||||
sim_printf ("%s%d: '%s' Found containing ODS%d File system:\n", sim_dname (dptr), (int)(uptr-dptr->units), uptr->filename, Home.hm2$b_struclev);
|
||||
sim_printf ("%s%d: Volume Name: %12.12s ", sim_dname (dptr), (int)(uptr-dptr->units), Home.hm2$t_volname);
|
||||
sim_printf ("Format: %12.12s ", Home.hm2$t_format);
|
||||
sim_printf ("SectorsInVolume: %d\n", Scb.scb$l_volsize);
|
||||
sim_printf ("%s%d: '%s' Contains ODS%d File system:\n", sim_dname (dptr), (int)(uptr-dptr->units), uptr->filename, Home.hm2_b_struclev);
|
||||
sim_printf ("%s%d: Volume Name: %12.12s ", sim_dname (dptr), (int)(uptr-dptr->units), Home.hm2_t_volname);
|
||||
sim_printf ("Format: %12.12s ", Home.hm2_t_format);
|
||||
sim_printf ("SectorsInVolume: %d\n", Scb.scb_l_volsize);
|
||||
}
|
||||
ret_val = ((t_offset)Scb.scb$l_volsize) * 512;
|
||||
ret_val = ((t_offset)Scb.scb_l_volsize) * 512;
|
||||
|
||||
Return_Cleanup:
|
||||
uptr->capac = saved_capac;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue