Permalink
Browse files

Completing merge of v3.9-0-rc1 compile cleanups

  • Loading branch information...
1 parent 2b43b35 commit cf280ad8f77b5d446d47741755893e56689a5a88 @markpizz markpizz committed Mar 21, 2012
@@ -1774,15 +1774,16 @@ void PutByteDMA(const uint32 Addr, const uint32 Value) {
static int32 sim_brk_lookup (const t_addr loc, const int32 btyp) {
extern t_bool sim_brk_pend[SIM_BKPT_N_SPC];
extern t_addr sim_brk_ploc[SIM_BKPT_N_SPC];
- extern char *sim_brk_act;
+ extern int32 sim_do_depth;
+ extern char *sim_brk_act[];
BRKTAB *bp;
if ((bp = sim_brk_fnd (loc)) && /* entry in table? */
(btyp & bp -> typ) && /* type match? */
(!sim_brk_pend[0] || (loc != sim_brk_ploc[0])) && /* new location? */
(--(bp -> cnt) <= 0)) { /* count reach 0? */
bp -> cnt = 0; /* reset count */
sim_brk_ploc[0] = loc; /* save location */
- sim_brk_act = bp -> act; /* set up actions */
+ sim_brk_act[sim_do_depth] = bp -> act; /* set up actions */
sim_brk_pend[0] = TRUE; /* don't do twice */
return TRUE;
}
@@ -132,7 +132,7 @@ static t_stat sio_attach(UNIT *uptr, char *cptr);
static t_stat sio_detach(UNIT *uptr);
static t_stat ptr_reset(DEVICE *dptr);
static t_stat ptp_reset(DEVICE *dptr);
-static t_stat toBool(char tf, int *result);
+static t_stat toBool(char tf, int32 *result);
static t_stat sio_dev_set_port(UNIT *uptr, int32 value, char *cptr, void *desc);
static t_stat sio_dev_show_port(FILE *st, UNIT *uptr, int32 val, void *desc);
static t_stat sio_dev_set_interrupton(UNIT *uptr, int32 value, char *cptr, void *desc);
@@ -859,7 +859,7 @@ int32 sio1d(const int32 port, const int32 io, const int32 data) {
return result;
}
-static t_stat toBool(char tf, int *result) {
+static t_stat toBool(char tf, int32 *result) {
if (tf == 'T') {
*result = TRUE;
return SCPE_OK;
View
@@ -476,8 +476,8 @@ static char *messages[0x20] = {
uint8 I8272_Write(const uint32 Addr, uint8 cData)
{
I8272_DRIVE_INFO *pDrive;
- unsigned int flags = 0;
- unsigned int readlen;
+ uint32 flags = 0;
+ uint32 readlen;
uint8 disk_read = 0;
int32 i;
View
@@ -417,8 +417,8 @@ static uint8 MFDC_Read(const uint32 Addr)
if(mfdc_info->datacount == 0) {
unsigned int i, checksum;
unsigned long sec_offset;
- unsigned int flags;
- unsigned int readlen;
+ uint32 flags;
+ uint32 readlen;
/* Clear out unused portion of sector. */
memset(&sdata.u.unused[0], 0x00, 10);
@@ -516,8 +516,8 @@ static uint8 MFDC_Read(const uint32 Addr)
static uint8 MFDC_Write(const uint32 Addr, uint8 cData)
{
unsigned int sec_offset;
- unsigned int flags = 0;
- unsigned int writelen;
+ uint32 flags = 0;
+ uint32 writelen;
MFDC_DRIVE_INFO *pDrive;
pDrive = &mfdc_info->drive[mfdc_info->sel_drive];
View
@@ -534,7 +534,7 @@ static void VFDHD_Command(void)
if(vfdhd_info->read == 1) { /* Perform a Read operation */
unsigned int i, checksum;
- unsigned int readlen;
+ uint32 readlen;
sim_debug(RD_DATA_MSG, &vfdhd_dev, "VFDHD: " ADDRESS_FORMAT " RD: Drive=%d, Track=%d, Head=%d, Sector=%d\n", PCX, vfdhd_info->sel_drive, pDrive->track, vfdhd_info->head, vfdhd_info->sector);
@@ -601,7 +601,7 @@ static void VFDHD_Command(void)
}
} else { /* Perform a Write operation */
- unsigned int writelen;
+ uint32 writelen;
sim_debug(WR_DATA_MSG, &vfdhd_dev, "VFDHD: " ADDRESS_FORMAT " WR: Drive=%d, Track=%d, Head=%d, Sector=%d\n", PCX, vfdhd_info->sel_drive, pDrive->track, vfdhd_info->head, vfdhd_info->sector);
View
@@ -444,8 +444,8 @@ uint8 WD179X_Read(const uint32 Addr)
{
uint8 cData;
WD179X_DRIVE_INFO *pDrive;
- unsigned int flags = 0;
- unsigned int readlen;
+ uint32 flags = 0;
+ uint32 readlen;
int status;
if(wd179x_info->sel_drive >= WD179X_MAX_DRIVES) {
@@ -571,8 +571,8 @@ static uint8 Do1793Command(uint8 cCommand)
{
uint8 result = 0;
WD179X_DRIVE_INFO *pDrive;
- unsigned int flags = 0;
- unsigned int readlen;
+ uint32 flags = 0;
+ uint32 readlen;
int status;
if(wd179x_info->sel_drive >= WD179X_MAX_DRIVES) {
@@ -952,8 +952,8 @@ uint8 WD179X_Write(const uint32 Addr, uint8 cData)
{
WD179X_DRIVE_INFO *pDrive;
/* uint8 disk_read = 0; */
- unsigned int flags = 0;
- unsigned int writelen;
+ uint32 flags = 0;
+ uint32 writelen;
if(wd179x_info->sel_drive >= WD179X_MAX_DRIVES) {
return 0xFF;
View
@@ -253,14 +253,14 @@ t_stat rl_set_bad (UNIT *uptr, int32 val, char *cptr, void *desc);
static void rlv_maint (void);
t_stat rl_detach (UNIT *uptr);
t_stat rl_set_cover (UNIT *, int32, char *, void *);
-t_stat rl_show_cover (FILE *, UNIT *, int, void *);
+t_stat rl_show_cover (FILE *, UNIT *, int32, void *);
t_stat rl_set_load (UNIT *, int32, char *, void *);
-t_stat rl_show_load (FILE *, UNIT *, int, void *);
-t_stat rl_show_dstate (FILE *, UNIT *, int, void *);
+t_stat rl_show_load (FILE *, UNIT *, int32, void *);
+t_stat rl_show_dstate (FILE *, UNIT *, int32, void *);
#if defined (VM_PDP11)
t_stat rl_set_ctrl (UNIT *uptr, int32 val, char *cptr, void *desc);
#endif
-t_stat rl_show_ctrl (FILE *st, UNIT *uptr, int val, void *desc);
+t_stat rl_show_ctrl (FILE *st, UNIT *uptr, int32 val, void *desc);
/* RL11 data structures
@@ -1043,7 +1043,7 @@ t_stat rl_set_cover (UNIT *uptr, int32 val, char *cptr, void *desc)
return (SCPE_OK);
}
-t_stat rl_show_cover (FILE *st, UNIT *uptr, int val, void *desc)
+t_stat rl_show_cover (FILE *st, UNIT *uptr, int32 val, void *desc)
{
fprintf (st, "cover %s", (uptr->STAT & RLDS_CVO) ? "open" : "closed");
return (SCPE_OK);
@@ -1072,14 +1072,14 @@ t_stat rl_set_load (UNIT *uptr, int32 val, char *cptr, void *desc)
return (SCPE_OK);
}
-t_stat rl_show_load (FILE *st, UNIT *uptr, int val, void *desc)
+t_stat rl_show_load (FILE *st, UNIT *uptr, int32 val, void *desc)
{
fprintf (st, "load %s",
((uptr->STAT & RLDS_M_STATE) != RLDS_LOAD) ? "set" : "reset");
return (SCPE_OK);
}
-t_stat rl_show_dstate (FILE *st, UNIT *uptr, int val, void *desc)
+t_stat rl_show_dstate (FILE *st, UNIT *uptr, int32 val, void *desc)
{
int32 cnt;
@@ -1121,7 +1121,7 @@ t_stat rl_set_ctrl (UNIT *uptr, int32 val, char *cptr, void *desc)
#endif
/* SHOW RL will display the controller type */
-t_stat rl_show_ctrl (FILE *st, UNIT *uptr, int val, void *desc)
+t_stat rl_show_ctrl (FILE *st, UNIT *uptr, int32 val, void *desc)
{
char *s = "RLV12";
View
@@ -130,7 +130,7 @@ t_stat rx_wr (int32 data, int32 PA, int32 access);
t_stat rx_svc (UNIT *uptr);
t_stat rx_reset (DEVICE *dptr);
t_stat rx_boot (int32 unitno, DEVICE *dptr);
-void rx_done (int esr_flags, int new_ecode);
+void rx_done (int32 esr_flags, int32 new_ecode);
/* RX11 data structures
View
@@ -161,7 +161,7 @@ t_stat ry_wr (int32 data, int32 PA, int32 access);
t_stat ry_svc (UNIT *uptr);
t_stat ry_reset (DEVICE *dptr);
t_stat ry_boot (int32 unitno, DEVICE *dptr);
-void ry_done (int esr_flags, int new_ecode);
+void ry_done (int32 esr_flags, int32 new_ecode);
t_stat ry_set_size (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat ry_attach (UNIT *uptr, char *cptr);
Oops, something went wrong.

0 comments on commit cf280ad

Please sign in to comment.