folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Add command argument passed into library unit test routines

Browse source
This commit is contained in:
Mark Pizzolato 2022-02-07 04:21:16 -08:00
parent 9f3bd71e66
commit a4054f33b8
11 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scp.c
View file

@ -16356,20 +16356,20 @@ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {
switch (DEV_TYPE(dptr)) { switch (DEV_TYPE(dptr)) {
#if defined(USE_SIM_CARD) #if defined(USE_SIM_CARD)
case DEV_CARD: case DEV_CARD:
tstat = sim_card_test (dptr); tstat = sim_card_test (dptr, cptr);
break; break;
#endif #endif
case DEV_DISK: case DEV_DISK:
tstat = sim_disk_test (dptr); tstat = sim_disk_test (dptr, cptr);
break; break;
case DEV_ETHER: case DEV_ETHER:
tstat = sim_ether_test (dptr); tstat = sim_ether_test (dptr, cptr);
break; break;
case DEV_TAPE: case DEV_TAPE:
tstat = sim_tape_test (dptr); tstat = sim_tape_test (dptr, cptr);
break; break;
case DEV_MUX: case DEV_MUX:
tstat = tmxr_sock_test (dptr); tstat = tmxr_sock_test (dptr, cptr);
break; break;
default: default:
break; break;

4
sim_card.c
View file

@ -1470,7 +1470,7 @@ return SCPE_OK;
#include <setjmp.h> #include <setjmp.h>
t_stat sim_card_test (DEVICE *dptr) t_stat sim_card_test (DEVICE *dptr, const char *cptr)
{ {
t_stat stat = SCPE_OK; t_stat stat = SCPE_OK;
#if defined(USE_SIM_CARD) && defined(SIM_CARD_API) && (SIM_MAJOR > 3) #if defined(USE_SIM_CARD) && defined(SIM_CARD_API) && (SIM_MAJOR > 3)
@ -1536,7 +1536,7 @@ t_stat sim_card_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, cons
return SCPE_OK; return SCPE_OK;
} }
t_stat sim_card_test (DEVICE *dptr) t_stat sim_card_test (DEVICE *dptr, const char *cptr)
{ {
return SCPE_OK; return SCPE_OK;
} }

2
sim_card.h
View file

@ -145,7 +145,7 @@ extern const char sim_ascii_to_six[128]; /* Map 7 bit ASCII to BCD */
extern const uint8 sim_parity_table[64]; /* 64 entry odd parity table */ extern const uint8 sim_parity_table[64]; /* 64 entry odd parity table */
/* Unit test routine */ /* Unit test routine */
extern t_stat sim_card_test (DEVICE *dptr); extern t_stat sim_card_test (DEVICE *dptr, const char *cptr);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
sim_disk.c
View file

@ -6408,7 +6408,7 @@ if (r == SCPE_OK) {
return r; return r;
} }
t_stat sim_disk_test (DEVICE *dptr) t_stat sim_disk_test (DEVICE *dptr, const char *cptr)
{ {
const char *fmt[] = {"RAW", "VHD", "VHD", "SIMH", NULL}; const char *fmt[] = {"RAW", "VHD", "VHD", "SIMH", NULL};
uint32 sect_size[] = {576, 4096, 1024, 512, 256, 128, 64, 0}; uint32 sect_size[] = {576, 4096, 1024, 512, 256, 128, 64, 0};

2
sim_disk.h
View file

@ -114,7 +114,7 @@ t_bool sim_disk_vhd_support (void);
t_bool sim_disk_raw_support (void); t_bool sim_disk_raw_support (void);
void sim_disk_data_trace (UNIT *uptr, const uint8 *data, size_t lba, size_t len, const char* txt, int detail, uint32 reason); void sim_disk_data_trace (UNIT *uptr, const uint8 *data, size_t lba, size_t len, const char* txt, int detail, uint32 reason);
t_stat sim_disk_info_cmd (int32 flag, CONST char *ptr); t_stat sim_disk_info_cmd (int32 flag, CONST char *ptr);
t_stat sim_disk_test (DEVICE *dptr); t_stat sim_disk_test (DEVICE *dptr, const char *cptr);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
sim_ether.c
View file

@ -4472,7 +4472,7 @@ return (errors == 0) ? SCPE_OK : SCPE_IERR;
#include <setjmp.h> #include <setjmp.h>
t_stat sim_ether_test (DEVICE *dptr) t_stat sim_ether_test (DEVICE *dptr, const char *cptr)
{ {
t_stat stat = SCPE_OK; t_stat stat = SCPE_OK;
SIM_TEST_INIT; SIM_TEST_INIT;

2
sim_ether.h
View file

@ -387,7 +387,7 @@ void ethq_insert_data(ETH_QUE* que, int32 type, /* insert item into FIFO
size_t crc_len, const uint8 *crc_data, int32 status); size_t crc_len, const uint8 *crc_data, int32 status);
t_stat ethq_destroy(ETH_QUE* que); /* release FIFO queue */ t_stat ethq_destroy(ETH_QUE* que); /* release FIFO queue */
const char *eth_capabilities(void); const char *eth_capabilities(void);
t_stat sim_ether_test (DEVICE *dptr); /* unit test routine */ t_stat sim_ether_test (DEVICE *dptr, const char *cptr); /* unit test routine */
#if !defined(SIM_TEST_INIT) /* Need stubs for test APIs */ #if !defined(SIM_TEST_INIT) /* Need stubs for test APIs */
#define SIM_TEST_INIT #define SIM_TEST_INIT

2
sim_tape.c
View file

@ -4292,7 +4292,7 @@ return SCPE_OK;
#include <setjmp.h> #include <setjmp.h>
t_stat sim_tape_test (DEVICE *dptr) t_stat sim_tape_test (DEVICE *dptr, const char *cptr)
{ {
int32 saved_switches = sim_switches; int32 saved_switches = sim_switches;
SIM_TEST_INIT; SIM_TEST_INIT;

2
sim_tape.h
View file

@ -233,7 +233,7 @@ t_stat sim_tape_show_dens (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat sim_tape_density_supported (char *string, size_t string_size, int32 valid_bits); t_stat sim_tape_density_supported (char *string, size_t string_size, int32 valid_bits);
t_stat sim_tape_set_asynch (UNIT *uptr, int latency); t_stat sim_tape_set_asynch (UNIT *uptr, int latency);
t_stat sim_tape_clr_asynch (UNIT *uptr); t_stat sim_tape_clr_asynch (UNIT *uptr);
t_stat sim_tape_test (DEVICE *dptr); t_stat sim_tape_test (DEVICE *dptr, const char *cptr);
t_stat sim_tape_add_debug (DEVICE *dptr); t_stat sim_tape_add_debug (DEVICE *dptr);
#ifdef __cplusplus #ifdef __cplusplus

2
sim_tmxr.c
View file

@ -6141,7 +6141,7 @@ return SCPE_OK;
#include <setjmp.h> #include <setjmp.h>
t_stat tmxr_sock_test (DEVICE *dptr) t_stat tmxr_sock_test (DEVICE *dptr, const char *cptr)
{ {
char cmd[CBUFSIZE], host[CBUFSIZE], port[CBUFSIZE]; char cmd[CBUFSIZE], host[CBUFSIZE], port[CBUFSIZE];
int line; int line;

2
sim_tmxr.h
View file

@ -325,7 +325,7 @@ const char *tmxr_send_line_name (const SEND *snd);
const char *tmxr_expect_line_name (const EXPECT *exp); const char *tmxr_expect_line_name (const EXPECT *exp);
t_stat tmxr_startup (void); t_stat tmxr_startup (void);
t_stat tmxr_shutdown (void); t_stat tmxr_shutdown (void);
t_stat tmxr_sock_test (DEVICE *dptr); t_stat tmxr_sock_test (DEVICE *dptr, const char *cptr);
t_stat tmxr_start_poll (void); t_stat tmxr_start_poll (void);
t_stat tmxr_stop_poll (void); t_stat tmxr_stop_poll (void);
/* Framer support. These are a NOP if called on a non-framer line. */ /* Framer support. These are a NOP if called on a non-framer line. */