1
0
mirror of https://github.com/rcornwell/sims.git synced 2026-04-13 23:44:27 +00:00

ICL1900: Remove compiler warnings.

This commit is contained in:
Richard Cornwell
2020-10-12 23:27:46 -04:00
parent bb03b35bab
commit c3490e1484
12 changed files with 51 additions and 51 deletions

View File

@@ -60,9 +60,9 @@
MODE_029
void cdp_cmd (int dev, uint32 cmd, uint32 *resp);
void cdp_nsi_cmd (int dev, uint32 cmd);
void cdp_nsi_status (int dev, uint32 *resp);
void cdp_cmd (uint32 dev, uint32 cmd, uint32 *resp);
void cdp_nsi_cmd (uint32 dev, uint32 cmd);
void cdp_nsi_status (uint32 dev, uint32 *resp);
t_stat cdp_svc (UNIT *uptr);
t_stat cdp_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr);
CONST char *cdp_description (DEVICE *dptr);
@@ -102,7 +102,7 @@ DEVICE cdp_dev = {
*/
void cdp_cmd(int dev, uint32 cmd, uint32 *resp) {
void cdp_cmd(uint32 dev, uint32 cmd, uint32 *resp) {
uint32 i;
UNIT *uptr = NULL;
@@ -164,7 +164,7 @@ void cdp_cmd(int dev, uint32 cmd, uint32 *resp) {
* xxxx01 Start punch.
* xxxx10 Stop punch.
*/
void cdp_nsi_cmd(int dev, uint32 cmd) {
void cdp_nsi_cmd(uint32 dev, uint32 cmd) {
uint32 i;
UNIT *uptr = NULL;
@@ -214,7 +214,7 @@ void cdp_nsi_cmd(int dev, uint32 cmd) {
* 020 ACCEPT
* 040 BUSY
*/
void cdp_nsi_status(int dev, uint32 *resp) {
void cdp_nsi_status(uint32 dev, uint32 *resp) {
uint32 i;
UNIT *uptr = NULL;

View File

@@ -1362,7 +1362,7 @@ branch:
RB &= M23;
n = (RA & B0) != 0;
temp = (RA & BM1) != 0;
if (n != temp) {
if ((uint32)n != temp) {
BV = 1;
if (!exe_mode && (Mode & 7) == 4)
SR64 |= B2;

View File

@@ -64,9 +64,9 @@
UNIT_DISABLE|UNIT_RO|MODE_029
void cdr_cmd (int dev, uint32 cmd, uint32 *resp);
void cdr_nsi_cmd (int dev, uint32 cmd);
void cdr_nsi_status (int dev, uint32 *resp);
void cdr_cmd (uint32 dev, uint32 cmd, uint32 *resp);
void cdr_nsi_cmd (uint32 dev, uint32 cmd);
void cdr_nsi_status (uint32 dev, uint32 *resp);
t_stat cdr_svc (UNIT *uptr);
t_stat cdr_boot (int32 unit_num, DEVICE * dptr);
t_stat cdr_reset (DEVICE *dptr);
@@ -113,7 +113,7 @@ DEVICE cdr_dev = {
*/
void cdr_cmd(int dev, uint32 cmd, uint32 *resp) {
void cdr_cmd(uint32 dev, uint32 cmd, uint32 *resp) {
uint32 i;
UNIT *uptr = NULL;
@@ -178,7 +178,7 @@ void cdr_cmd(int dev, uint32 cmd, uint32 *resp) {
* xxxx01 Start reader.
* xxxx10 Stop reader.
*/
void cdr_nsi_cmd(int dev, uint32 cmd) {
void cdr_nsi_cmd(uint32 dev, uint32 cmd) {
uint32 i;
UNIT *uptr = NULL;
@@ -228,7 +228,7 @@ void cdr_nsi_cmd(int dev, uint32 cmd) {
* 020 ACCEPT
* 040 BUSY
*/
void cdr_nsi_status(int dev, uint32 *resp) {
void cdr_nsi_status(uint32 dev, uint32 *resp) {
uint32 i;
UNIT *uptr = NULL;
@@ -323,7 +323,7 @@ t_stat cdr_svc (UNIT *uptr)
t_stat
cdr_reset(DEVICE *dptr)
{
int i;
unsigned int i;
memset(&hol_to_mem[0], 0xff, 4096);
for(i = 0; i < (sizeof(mem_to_hol)/sizeof(uint16)); i++) {

View File

@@ -28,8 +28,8 @@
#include "icl1900_defs.h"
extern int32 tmxr_poll;
void cty_cmd(int dev, uint32 cmd);
void cty_status(int dev, uint32 *resp);
void cty_cmd(uint32 dev, uint32 cmd);
void cty_status(uint32 dev, uint32 *resp);
t_stat ctyi_svc (UNIT *uptr);
t_stat ctyo_svc (UNIT *uptr);
t_stat cty_reset (DEVICE *dptr);
@@ -101,7 +101,7 @@ DEVICE cty_dev = {
* 11xxxx -> 101xxxx
*
*/
void cty_cmd(int dev, uint32 cmd) {
void cty_cmd(uint32 dev, uint32 cmd) {
int u = 0;
if (dev > 3)
@@ -122,7 +122,7 @@ void cty_cmd(int dev, uint32 cmd) {
chan_clr_done(GET_UADDR(cty_unit[u].flags));
}
void cty_status(int dev, uint32 *resp) {
void cty_status(uint32 dev, uint32 *resp) {
int u = 0;
if (dev > 3)

View File

@@ -250,9 +250,9 @@ t_opcode;
struct icl_dib {
uint8 type; /* Type of device */
void (*si_cmd)(int dev, uint32 cmd, uint32 *resp); /* Start io on device */
void (*nsi_cmd)(int dev, uint32 cmd); /* Start non-standard I/O on device */
void (*nsi_status)(int dev, uint32 *resp); /* Non-Standard I/O status */
void (*si_cmd)(uint32 dev, uint32 cmd, uint32 *resp); /* Start io on device */
void (*nsi_cmd)(uint32 dev, uint32 cmd); /* Start non-standard I/O on device */
void (*nsi_status)(uint32 dev, uint32 *resp); /* Non-Standard I/O status */
};
typedef struct icl_dib DIB;

View File

@@ -100,7 +100,7 @@
int eds8_busy; /* Indicates that controller is talking to a drive */
int eds8_drive; /* Indicates last selected drive */
uint32 eds8_buffer[WD_SEC];
void eds8_cmd (int dev, uint32 cmd, uint32 *resp);
void eds8_cmd (uint32 dev, uint32 cmd, uint32 *resp);
t_stat eds8_svc (UNIT *uptr);
t_stat eds8_reset (DEVICE *dptr);
t_stat eds8_boot (int32 unit_num, DEVICE * dptr);
@@ -139,7 +139,7 @@ DEVICE eds8_dev = {
NULL, NULL, &eds8_help, NULL, NULL, &eds8_description
};
void eds8_cmd(int dev, uint32 cmd, uint32 *resp) {
void eds8_cmd(uint32 dev, uint32 cmd, uint32 *resp) {
UNIT *uptr = &eds8_unit[eds8_drive];
*resp = 0;
if (cmd & 0400) {

View File

@@ -73,9 +73,9 @@
#define UNIT_LPR(x) UNIT_ADDR(x)|SET_TYPE(T1931_2)|UNIT_ATTABLE|UNIT_DISABLE
void lpr_cmd (int dev, uint32 cmd, uint32 *resp);
void lpr_nsi_cmd (int dev, uint32 cmd);
void lpr_nsi_status (int dev, uint32 *resp);
void lpr_cmd (uint32 dev, uint32 cmd, uint32 *resp);
void lpr_nsi_cmd (uint32 dev, uint32 cmd);
void lpr_nsi_status (uint32 dev, uint32 *resp);
t_stat lpr_svc (UNIT *uptr);
t_stat lpr_reset (DEVICE *dptr);
t_stat lpr_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr);
@@ -122,7 +122,7 @@ DEVICE lpr_dev = {
*/
void lpr_cmd(int dev, uint32 cmd, uint32 *resp) {
void lpr_cmd(uint32 dev, uint32 cmd, uint32 *resp) {
uint32 i;
UNIT *uptr = NULL;
@@ -185,7 +185,7 @@ void lpr_cmd(int dev, uint32 cmd, uint32 *resp) {
* xxxx01 Start print.
* xxxx10 Stop print.
*/
void lpr_nsi_cmd(int dev, uint32 cmd) {
void lpr_nsi_cmd(uint32 dev, uint32 cmd) {
uint32 i;
UNIT *uptr = NULL;
@@ -235,7 +235,7 @@ void lpr_nsi_cmd(int dev, uint32 cmd) {
* 020 ACCEPT
* 040 BUSY
*/
void lpr_nsi_status(int dev, uint32 *resp) {
void lpr_nsi_status(uint32 dev, uint32 *resp) {
uint32 i;
UNIT *uptr = NULL;
@@ -301,7 +301,7 @@ t_stat lpr_svc (UNIT *uptr)
else if (LW_160(uptr->flags))
len = 160;
i = 0;
while (eor == 0 && i < len && i <sizeof(buffer)-4) {
while (eor == 0 && i < len && i < (int)(sizeof(buffer)-4)) {
eor = chan_output_char(GET_UADDR(uptr->flags), &ch, 0);
if (uptr->CMD & AUTO) {
uptr->CMD |= (int32)ch << 8;

View File

@@ -102,7 +102,7 @@
int mt_busy; /* Indicates that controller is talking to a drive */
int mt_drive; /* Indicates last selected drive */
uint8 mt_buffer[BUFFSIZE];
void mt_cmd (int dev, uint32 cmd, uint32 *resp);
void mt_cmd (uint32 dev, uint32 cmd, uint32 *resp);
t_stat mt_svc (UNIT *uptr);
t_stat mt_reset (DEVICE *dptr);
t_stat mt_boot (int32 unit_num, DEVICE * dptr);
@@ -143,7 +143,7 @@ DEVICE mt_dev = {
NULL, NULL, &mt_help, NULL, NULL, &mt_description
};
void mt_cmd(int dev, uint32 cmd, uint32 *resp) {
void mt_cmd(uint32 dev, uint32 cmd, uint32 *resp) {
UNIT *uptr = &mt_unit[mt_drive];
*resp = 0;
if (cmd & 0400) {

View File

@@ -104,8 +104,8 @@
int mta_busy; /* Indicates that controller is talking to a drive */
uint8 mta_buffer[BUFFSIZE];
void mta_nsi_cmd (int dev, uint32 cmd);
void mta_nsi_status (int dev, uint32 *resp);
void mta_nsi_cmd (uint32 dev, uint32 cmd);
void mta_nsi_status (uint32 dev, uint32 *resp);
t_stat mta_svc (UNIT *uptr);
t_stat mta_reset (DEVICE *dptr);
t_stat mta_boot (int32 unit_num, DEVICE * dptr);
@@ -148,7 +148,7 @@ DEVICE mta_dev = {
NULL, NULL, &mta_help, NULL, NULL, &mta_description
};
void mta_nsi_cmd(int dev, uint32 cmd) {
void mta_nsi_cmd(uint32 dev, uint32 cmd) {
int32 d;
UNIT *uptr;
@@ -185,7 +185,7 @@ void mta_nsi_cmd(int dev, uint32 cmd) {
}
}
void mta_nsi_status(int dev, uint32 *resp) {
void mta_nsi_status(uint32 dev, uint32 *resp) {
int32 d;
UNIT *uptr;

View File

@@ -41,9 +41,9 @@ DIB nul_dib = { 0, NULL, NULL, NULL};
t_stat
chan_set_devs()
{
int i;
uint32 j;
int chan;
unsigned int i;
uint32 j;
int chan;
/* Clear device table */
for (i = 0; i < sizeof(devs)/sizeof(DIB *); i++)

View File

@@ -107,9 +107,9 @@
*
*/
void ptp_cmd (int dev, uint32 cmd, uint32 *resp);
void ptp_nsi_cmd (int dev, uint32 cmd);
void ptp_nsi_status (int dev, uint32 *resp);
void ptp_cmd (uint32 dev, uint32 cmd, uint32 *resp);
void ptp_nsi_cmd (uint32 dev, uint32 cmd);
void ptp_nsi_status (uint32 dev, uint32 *resp);
t_stat ptp_svc (UNIT *uptr);
t_stat ptp_reset (DEVICE *dptr);
t_stat ptp_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr);
@@ -159,7 +159,7 @@ DEVICE ptp_dev = {
*/
void ptp_cmd(int dev, uint32 cmd, uint32 *resp) {
void ptp_cmd(uint32 dev, uint32 cmd, uint32 *resp) {
uint32 i;
UNIT *uptr = NULL;
@@ -241,7 +241,7 @@ void ptp_cmd(int dev, uint32 cmd, uint32 *resp) {
* x1xxxx Graphics mode.
* 1xxxxx Punch blanks.
*/
void ptp_nsi_cmd(int dev, uint32 cmd) {
void ptp_nsi_cmd(uint32 dev, uint32 cmd) {
uint32 i;
UNIT *uptr = NULL;
@@ -298,7 +298,7 @@ void ptp_nsi_cmd(int dev, uint32 cmd) {
* 020 ACCEPT
* 040 BUSY
*/
void ptp_nsi_status(int dev, uint32 *resp) {
void ptp_nsi_status(uint32 dev, uint32 *resp) {
uint32 i;
UNIT *uptr = NULL;

View File

@@ -108,9 +108,9 @@
*
*/
void ptr_cmd (int dev, uint32 cmd, uint32 *resp);
void ptr_nsi_cmd (int dev, uint32 cmd);
void ptr_nsi_status (int dev, uint32 *resp);
void ptr_cmd (uint32 dev, uint32 cmd, uint32 *resp);
void ptr_nsi_cmd (uint32 dev, uint32 cmd);
void ptr_nsi_status (uint32 dev, uint32 *resp);
t_stat ptr_svc (UNIT *uptr);
t_stat ptr_reset (DEVICE *dptr);
t_stat ptr_boot (int32 unit_num, DEVICE * dptr);
@@ -163,7 +163,7 @@ DEVICE ptr_dev = {
*/
void ptr_cmd(int dev, uint32 cmd, uint32 *resp) {
void ptr_cmd(uint32 dev, uint32 cmd, uint32 *resp) {
uint32 i;
UNIT *uptr = NULL;
@@ -247,7 +247,7 @@ void ptr_cmd(int dev, uint32 cmd, uint32 *resp) {
* x1xxxx Graphics mode.
* 1xxxxx All characters.
*/
void ptr_nsi_cmd(int dev, uint32 cmd) {
void ptr_nsi_cmd(uint32 dev, uint32 cmd) {
uint32 i;
UNIT *uptr = NULL;
@@ -308,7 +308,7 @@ void ptr_nsi_cmd(int dev, uint32 cmd) {
* 020 ACCEPT
* 040 BUSY
*/
void ptr_nsi_status(int dev, uint32 *resp) {
void ptr_nsi_status(uint32 dev, uint32 *resp) {
uint32 i;
UNIT *uptr = NULL;