Index: rom/booter.c =================================================================== --- rom/booter.c (revision 411371e1e37956255823b10718da35900ee85cac) +++ rom/booter.c (revision 6262b5c7974b08ad57f56d797cf7106c80531276) @@ -8,10 +8,5 @@ #define PRINTIT 1 /* define non-zero to get printf output from booter */ -#include "stdio.h" -#include "io.h" -#include "stddefs.h" -#include "portab.h" -#include "objdefs.h" -#include "biosdefs.h" +#include "all.h" extern int16_t flread(int8_t *buff, int32_t len, FILE *fp); @@ -22,5 +17,5 @@ extern int16_t ClusMap(struct fcb *fcp); -extern int16_t waitcr(void); +extern int16_t waitcr2(void); #endif @@ -91,5 +86,5 @@ SnapFCB(fcp); ClusMap(fcp); - waitcr(); + waitcr2(); } #endif @@ -184,2 +179,3 @@ return(0); } + Index: rom/booter.x =================================================================== --- rom/booter.x (revision 6262b5c7974b08ad57f56d797cf7106c80531276) +++ rom/booter.x (revision 6262b5c7974b08ad57f56d797cf7106c80531276) @@ -0,0 +1,33 @@ +#pragma once + +#include "objdefs.h" +#include "stdint.h" + +/* + ============================================================================= + booter.c -- global variables + ============================================================================= +*/ + +extern int32_t B_bss_l; +extern int32_t B_bss_o; +extern int8_t *B_buf_a; +extern int32_t B_chk; +extern int32_t B_dat_l; +extern int32_t B_dat_o; +extern int16_t B_dbg_s; +extern int32_t B_end; +extern struct EXFILE B_fhdr; +extern int32_t B_lod_l; +extern int16_t B_log_s; +extern int32_t B_txt_l; +extern int32_t B_txt_o; + +/* + ============================================================================= + booter.c -- global functions + ============================================================================= +*/ + +extern int16_t booter(int8_t *fn, int32_t textadr); + Index: rom/romp.c =================================================================== --- rom/romp.c (revision 411371e1e37956255823b10718da35900ee85cac) +++ rom/romp.c (revision 6262b5c7974b08ad57f56d797cf7106c80531276) @@ -24,25 +24,5 @@ #define ONEMEG 1 /* 1 if 1024K, 0 if 512K RAM space (Buchla 700) */ -#include "ascii.h" -#include "biosdefs.h" -#include "ctype.h" -#include "errdefs.h" -#include "hwdefs.h" -#include "memory.h" -#include "rawio.h" -#include "regs.h" -#include "setjmp.h" -#include "stddefs.h" -#include "strings.h" -#include "vsdd.h" - -#if ON_B700 -#include "graphdef.h" -#include "vsddsw.h" -#include "vsddvars.h" - -#include "glcfns.h" -#include "stdio.h" -#endif +#include "all.h" /* @@ -829,5 +809,5 @@ /* ============================================================================= - waitcr() -- wait for a CR from CON_DEV + waitcr2() -- wait for a CR from CON_DEV Returns: 0 = continue 1 = ^G hit - abort @@ -835,5 +815,5 @@ */ -int16_t waitcr(void) +int16_t waitcr2(void) { int8_t c; @@ -1622,5 +1602,5 @@ j = 0; - if (waitcr()) + if (waitcr2()) return(TRUE); } @@ -4096,2 +4076,3 @@ } } + Index: rom/romp.x =================================================================== --- rom/romp.x (revision 6262b5c7974b08ad57f56d797cf7106c80531276) +++ rom/romp.x (revision 6262b5c7974b08ad57f56d797cf7106c80531276) @@ -0,0 +1,158 @@ +#pragma once + +#include "regs.h" +#include "stdint.h" + +/* + ============================================================================= + romp.c -- global variables + ============================================================================= +*/ + +extern int32_t afi; +extern int16_t aflag; +extern int8_t ahex[]; +extern int8_t *aptr; +extern int16_t argln; +extern int8_t argsep; +extern int8_t argstr[80 + 1]; +extern int16_t asig; +extern int16_t astat; +extern int16_t aval; +extern int16_t b0flag; +extern int16_t b1flag; +extern uint16_t baroff; +extern uint16_t baron; +extern int16_t baseled; +extern int8_t bfname[13 + 1]; +extern int8_t cmdline[128 + 1]; +extern int16_t cmdunit; +extern int8_t *d_cur; +extern int8_t *d_last; +extern int8_t *d_next; +extern int16_t dflag; +extern int16_t exflag; +extern int16_t first1; +extern int32_t ftimer; +extern int16_t goflag; +extern int8_t hs_mtst[80 + 1]; +extern int8_t idbuf[90 + 1]; +extern int16_t ilast; +extern int16_t inext; +extern int16_t iplev; +extern int16_t ledcntr; +extern int8_t *monptr; +extern int16_t monsw; +extern uint16_t *obj0; +extern uint16_t *p_ba0; +extern uint16_t *p_ba1; +extern uint16_t p_bv0; +extern uint16_t p_bv1; +extern int8_t *p_end; +extern int8_t *p_from; +extern int8_t *p_goto; +extern int32_t p_len; +extern int8_t *p_to; +extern int32_t p_value; +extern int32_t p_width; +extern int8_t promdate[14 + 1]; +extern int16_t redo; +extern struct regs *regptr; +extern jmp_buf restart; +extern int8_t *rlist[]; +extern int16_t rnum; +extern int16_t sigadr[]; +extern int16_t sigtab[128][2]; +extern int8_t *sptr; +extern uint16_t swoff; +extern uint16_t swon; +extern uint16_t *tba0; +extern uint16_t *tba1; +extern int8_t *vrlist[]; +extern int16_t vrnum; + +/* + ============================================================================= + romp.c -- global functions + ============================================================================= +*/ + +extern int16_t bphit(void); +extern int16_t cp_boot(void); +extern int16_t cp_chek(void); +extern int16_t cp_copy(void); +extern int16_t cp_dump(void); +extern int16_t cp_fill(void); +extern int16_t cp_go(void); +extern int16_t cp_ilev(void); +extern int16_t cp_ldmp(void); +extern int16_t cp_monc(void); +extern int16_t cp_monl(void); +extern int16_t cp_mons(void); +extern int16_t cp_mset(void); +extern int16_t cp_mtst(void); +extern int16_t cp_null(void); +extern int16_t cp_read(void); +extern int16_t cp_rset(void); +extern int16_t cp_vrst(void); +extern int16_t cp_wdmp(void); +extern int16_t cp_wfil(void); +extern int16_t cp_wset(void); +extern int16_t cx_adsp(void); +extern int16_t cx_boot(void); +extern int16_t cx_bpb(void); +extern int16_t cx_chek(void); +extern int16_t cx_copy(void); +extern int16_t cx_crsh(void); +extern int16_t cx_dini(void); +extern int16_t cx_dump(void); +extern void cx_exit(void); +extern int16_t cx_fill(void); +extern int16_t cx_go(void); +extern int16_t cx_help(void); +extern int16_t cx_ilev(void); +extern int16_t cx_ldmp(void); +extern int16_t cx_load(void); +extern int16_t cx_mlod(void); +extern int16_t cx_mon(void); +extern int16_t cx_mset(void); +extern int16_t cx_mtst(void); +extern int16_t cx_next(void); +extern int16_t cx_omap(void); +extern int16_t cx_read(void); +extern int16_t cx_regs(void); +extern void cx_rest(void); +extern int16_t cx_rset(void); +extern int16_t cx_vreg(void); +extern int16_t cx_vrst(void); +extern int16_t cx_wdmp(void); +extern int16_t cx_wfil(void); +extern int16_t cx_writ(void); +extern int16_t cx_wset(void); +extern void cx_zap(void); +extern int16_t ddump(int8_t *loc, int8_t *lastloc, int16_t nwide, int16_t unit); +extern void do_cmd(void); +extern int16_t do_srec(int8_t *line); +extern void dobar(int16_t nb, int16_t bv); +extern void dosw(int16_t nb, int16_t sv); +extern int16_t dtext(int8_t *loc, int8_t *lastloc, int16_t nwide, int16_t unit); +extern uint16_t exp_c(uint16_t c); +extern int16_t getarg(void); +extern int16_t getcmd(void); +extern int16_t getlong(int32_t *var); +extern int16_t ldump(int32_t *loc, int32_t *lastloc, int16_t nwide, int16_t unit); +extern void main(void); +extern void padr(int32_t adr, int16_t unit); +extern int16_t pclr(void); +extern void progid(void); +extern int16_t pscan(void); +extern void puthn(int32_t num, int16_t cw, int16_t unit); +extern void putn(int32_t num, int16_t cw, int16_t unit); +extern void rompbp(int32_t d0, int32_t d1, int32_t d2, int32_t d3, int32_t d4, int32_t d5, int32_t d6, int32_t d7, int8_t *a0, int8_t *a1, int8_t *a2, int8_t *a3, int8_t *a4, int8_t *a5, int8_t *a6, int8_t *a7, int8_t *pc, uint16_t sr0, uint16_t sr); +extern int16_t setvar(int32_t *var, int32_t deflt); +extern void showcr(void); +extern void showrs(struct regs *rp); +extern int16_t waitcr2(void); +extern int16_t wdump(uint16_t *loc, uint16_t *lastloc, int16_t nwide, int16_t unit); +extern int16_t xdtoi(int16_t c); +