Reintegrate wbw -> trunk

This commit is contained in:
wayne
2013-05-25 06:08:10 +00:00
parent 7c2a1b447b
commit f5c27ce732
42 changed files with 678 additions and 185 deletions

View File

@@ -5,10 +5,10 @@
#define A_RMJ 2
#define A_RMN 5
#define A_RUP 0
#define A_RTP 10
#define A_RTP 12
#define A_MONTH 5
#define A_DAY 17
#define A_DAY 24
#define A_YEAR 2013
#define A_YR 13

View File

@@ -3,14 +3,14 @@
A$RMJ equ 2
A$RMN equ 5
A$RUP equ 0
A$RTP equ 10
A$RTP equ 12
A$MONTH equ 5
A$DAY equ 17
A$DAY equ 24
A$YEAR equ 2013
date macro
dat db ' 5/17/2013$'
dat db ' 5/24/2013$'
endm
serial macro

View File

@@ -35,6 +35,7 @@ struct CNFGDATA {
unsigned char defcon;
unsigned char altcon;
unsigned int conbaud;
unsigned char defvda;
unsigned char defemu;
unsigned char termtype;
@@ -49,12 +50,27 @@ struct CNFGDATA {
unsigned char dskyenable;
unsigned char uartenable;
unsigned char uartfifo;
unsigned char uartafc;
unsigned char uartcnt;
unsigned char uart0iob;
unsigned int uart0baud; /* actual baudrate / 10 */
unsigned char uart0fifo;
unsigned char uart0afc;
unsigned char uart1iob;
unsigned int uart1baud; /* actual baudrate / 10 */
unsigned char uart1fifo;
unsigned char uart1afc;
unsigned char uart2iob;
unsigned int uart2baud; /* actual baudrate / 10 */
unsigned char uart2fifo;
unsigned char uart2afc;
unsigned char uart3iob;
unsigned int uart3baud; /* actual baudrate / 10 */
unsigned char uart3fifo;
unsigned char uart3afc;
unsigned char ascienable;
unsigned int baudrate; /* actual baudrate / 10 */
unsigned int asci0baud; /* actual baudrate / 10 */
unsigned int asci1baud; /* actual baudrate / 10 */
unsigned char vduenable;

View File

@@ -94,7 +94,7 @@ pager()
}
}
prtcfg(pSysCfg)
prtcfg1(pSysCfg)
struct SYSCFG * pSysCfg;
{
struct CNFGDATA * pCfg;
@@ -123,8 +123,9 @@ prtcfg(pSysCfg)
pager();
pager();
printf("Default Console: %s, Alternate Console: %s",
CIOName[pCfg->defcon], CIOName[pCfg->altcon]);
printf("Console: Default=%s, Alternate=%s, Init Baudrate=%d0",
CIOName[pCfg->defcon], CIOName[pCfg->altcon],
pCfg->conbaud);
pager();
printf ("Default Video Display: %s, Default Emulation: %s",
VDAName[pCfg->defvda], EmuName[pCfg->defemu]);
@@ -147,12 +148,35 @@ prtcfg(pSysCfg)
printf("DSKY %s", fmtenable(pCfg->dskyenable));
pager();
printf("UART %s, FIFO=%s, AFC=%s, Baudrate=%d0",
fmtenable(pCfg->uartenable), fmtbool(pCfg->uartfifo),
fmtbool(pCfg->uartafc), pCfg->baudrate);
if (pCfg->uartenable)
{
printf("UART Enabled");
pager();
if (pCfg->uartcnt >= 1)
printf("UART0 FIFO=%s, AFC=%s, Baudrate=%d0",
fmtbool(pCfg->uart0fifo), fmtbool(pCfg->uart0afc), pCfg->uart0baud);
if (pCfg->uartcnt >= 2)
printf("UART1 FIFO=%s, AFC=%s, Baudrate=%d0",
fmtbool(pCfg->uart1fifo), fmtbool(pCfg->uart1afc), pCfg->uart1baud);
if (pCfg->uartcnt >= 3)
printf("UART2 FIFO=%s, AFC=%s, Baudrate=%d0",
fmtbool(pCfg->uart2fifo), fmtbool(pCfg->uart2afc), pCfg->uart2baud);
if (pCfg->uartcnt >= 4)
printf("UART3 FIFO=%s, AFC=%s, Baudrate=%d0",
fmtbool(pCfg->uart3fifo), fmtbool(pCfg->uart3afc), pCfg->uart3baud);
}
else
printf("UART Disabled");
pager();
printf("ASCI %s, Baudrate=%d0",
fmtenable(pCfg->ascienable), pCfg->baudrate);
if (pCfg->ascienable)
{
printf("ASCI Enabled");
pager();
printf("ASCI0, Baudrate=%d0", pCfg->asci0baud);
printf("ASCI1, Baudrate=%d0", pCfg->asci1baud);
}
else
printf("ASCI Disabled");
pager();
printf("VDU %s", fmtenable(pCfg->vduenable));
pager();
@@ -163,6 +187,16 @@ prtcfg(pSysCfg)
printf("N8V %s", fmtenable(pCfg->n8venable));
pager();
pager();
}
prtcfg2(pSysCfg)
struct SYSCFG * pSysCfg;
{
struct CNFGDATA * pCfg;
char buf[5];
char buf2[5];
pCfg = &(pSysCfg->cnfgdata);
printf("FD %s, Mode=%s, TraceLevel=%d, Media=%s/%s, Auto=%s",
fmtenable(pCfg->fdenable), FDModeName[pCfg->fdmode],
@@ -240,7 +274,8 @@ int main(argc,argv)
return;
}
prtcfg(pSysCfg);
prtcfg1(pSysCfg);
prtcfg2(pSysCfg);
}
/********************/