Index: ram/addfpu.c =================================================================== --- ram/addfpu.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/addfpu.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -10,5 +10,6 @@ #define MAXSEGT 32767 -extern unsigned tofpu(), fromfpu(); +extern unsigned tofpu(unsigned time); +extern unsigned fromfpu(unsigned fputime); /* @@ -22,8 +23,5 @@ */ -unsigned -addfpu(t, k) -unsigned t; -short k; +unsigned addfpu(unsigned t, short k) { register short x, z; @@ -57,8 +55,5 @@ */ -unsigned -subfpu(t, k) -unsigned t; -short k; +unsigned subfpu(unsigned t, short k) { register short x, z; Index: ram/adfield.c =================================================================== --- ram/adfield.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/adfield.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -17,25 +17,73 @@ #include "asgdsp.h" -extern short select(), whatbox(), nokey(), stdctp4(); -extern short cxkstd(), cykstd(), stdmkey(), stddkey(); - -extern short et_null(), ef_null(), rd_null(), nd_null(); -extern short et_atab(), ef_atab(), rd_atab(), nd_atab(); -extern short et_aopt(), ef_aopt(), rd_aopt(), nd_aopt(); -extern short et_avgr(), ef_avgr(), rd_avgr(), nd_avgr(); -extern short et_accn(), ef_accn(), rd_accn(), nd_accn(); -extern short et_agpt(), ef_agpt(), rd_agpt(), nd_agpt(); -extern short et_agch(), ef_agch(), rd_agch(), nd_agch(); -extern short et_ains(), ef_ains(), rd_ains(), nd_ains(); -extern short et_adyn(), ef_adyn(), rd_adyn(), nd_adyn(); -extern short et_atun(), ef_atun(), rd_atun(), nd_atun(); -extern short et_aprg(), ef_aprg(), rd_aprg(), nd_aprg(); -extern short et_aint(), ef_aint(), rd_aint(), nd_aint(); -extern short et_arat(), ef_arat(), rd_arat(), nd_arat(); -extern short et_adep(), ef_adep(), rd_adep(), nd_adep(); - -extern short vcputsv(); - -extern char *memset(); +extern void select(void); +extern short whatbox(void); +extern short nokey(void); +extern short stdctp4(void); +extern void cxkstd(void); +extern void cykstd(void); +extern void stdmkey(void); +extern void stddkey(void); + +extern short et_null(void); +extern short ef_null(void); +extern short rd_null(void); +extern short nd_null(void); +extern short et_atab(short n); +extern short ef_atab(short n); +extern short rd_atab(short nn); +extern short nd_atab(short nn, short k); +extern short et_aopt(short n); +extern short ef_aopt(short n); +extern short rd_aopt(short nn); +extern short nd_aopt(short nn, short k); +extern short et_avgr(short nn); +extern short ef_avgr(short nn); +extern short rd_avgr(short nn); +extern short nd_avgr(short nn, short k); +extern short et_accn(short n); +extern short ef_accn(short n); +extern short rd_accn(short nn); +extern short nd_accn(short nn, short k); +extern short et_agpt(short n); +extern short ef_agpt(short n); +extern short rd_agpt(short nn); +extern short nd_agpt(short nn, short k); +extern short et_agch(short n); +extern short ef_agch(short n); +extern short rd_agch(short nn); +extern short nd_agch(short nn, short k); +extern short et_ains(short n); +extern short ef_ains(short n); +extern short rd_ains(short nn); +extern short nd_ains(short nn, short k); +extern short et_adyn(short n); +extern short ef_adyn(short n); +extern short rd_adyn(short nn); +extern short nd_adyn(short nn, short k); +extern short et_atun(short n); +extern short ef_atun(short n); +extern short rd_atun(short nn); +extern short nd_atun(short nn, short k); +extern short et_aprg(short n); +extern short ef_aprg(short n); +extern short rd_aprg(short nn); +extern short nd_aprg(short nn, short k); +extern short et_aint(short n); +extern short ef_aint(short n); +extern short rd_aint(short nn); +extern short nd_aint(short nn, short k); +extern short et_arat(short n); +extern short ef_arat(short n); +extern short rd_arat(short nn); +extern short nd_arat(short nn, short k); +extern short et_adep(short n); +extern short ef_adep(short n); +extern short rd_adep(short nn); +extern short nd_adep(short nn, short k); + +extern void vcputsv(int *obase, int nw, int fg, int bg, int row, int col, char *str, int pitch); + +extern char *memset(char *sp, char c, int n); extern short adnamsw; @@ -84,5 +132,7 @@ /* forward references */ -short adcxupd(), adcyupd(), ad_xkey(); +void adcxupd(void); +void adcyupd(void); +short ad_xkey(short nn); /* @@ -252,6 +302,5 @@ */ -short -adcyupd() +void adcyupd(void) { if (adnamsw) { @@ -281,6 +330,5 @@ */ -short -adcxupd() +void adcxupd(void) { if (adnamsw) { @@ -314,7 +362,5 @@ */ -short -ad_xkey(nn) -short nn; +short ad_xkey(short nn) { register short row, col, grp, i; @@ -471,5 +517,5 @@ */ -adfield() +void adfield(void) { curslim = 140; Index: ram/adselbx.c =================================================================== --- ram/adselbx.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/adselbx.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -25,6 +25,11 @@ #define ATDECOL 1 /* data entry base column */ -extern short enterit(), adswin(), advacur(), bspacur(); -extern short nokey(), vtdisp(), adpoint(); +extern void enterit(void); +extern void adswin(short n); +extern void advacur(void); +extern void bspacur(void); +extern short nokey(void); +extern void vtdisp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf); +extern void adpoint(short x, short y, short pen); extern short (*itxput)(); @@ -64,5 +69,6 @@ /* forward references */ -short bx_null(), adfnbox(); +short bx_null(void); +short adfnbox(short n); /* @@ -97,5 +103,5 @@ */ -endatyp() +void endatyp(void) { adnamsw = FALSE; @@ -118,8 +124,5 @@ */ -admtxt(row, col, txt, tag) -short row, col; -char *txt; -short tag; +void admtxt(short row, short col, char *txt, short tag) { if (v_regs[5] & 0x0180) @@ -139,6 +142,5 @@ */ -admenu(n) -short n; +void admenu(short n) { register short i; @@ -205,7 +207,5 @@ */ -short -adfnbox(n) -short n; +short adfnbox(short n) { register short i, grp, key, line; Index: ram/asgdsp.c =================================================================== --- ram/asgdsp.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/asgdsp.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -61,5 +61,5 @@ extern int (*point)(); -extern unsigned exp_c(); +extern unsigned exp_c(unsigned c); extern short stcrow, stccol, cxval, cyval; @@ -281,5 +281,5 @@ */ -advacur() +void advacur(void) { register short newcol; @@ -305,5 +305,5 @@ */ -bspacur() +void bspacur(void) { register short newcol; @@ -333,8 +333,5 @@ */ -keycpyw(dest, src, len, wk, bk) -register unsigned *dest, *src; -register short len; -unsigned wk, bk; +void keycpyw(unsigned *dest, unsigned *src, short len, unsigned wk, unsigned bk) { register unsigned wkey, bkey, theword; @@ -361,5 +358,5 @@ */ -asgkb() +void asgkb(void) { register unsigned *p; @@ -410,6 +407,5 @@ */ -drawk2g(grp) -register short grp; +void drawk2g(short grp) { register short i; @@ -464,6 +460,5 @@ */ -adpoint(x, y, pen) -short x, y, pen; +void adpoint(short x, short y, short pen) { if (v_regs[5] & 0x0180) @@ -479,8 +474,5 @@ */ -char * -numblk(buf, n) -char *buf; -short n; +char *numblk(char *buf, short n) { if (n EQ -1) { @@ -506,6 +498,5 @@ */ -adswin(n) -register short n; +void adswin(short n) { register short cx, i; @@ -792,6 +783,5 @@ */ -initat(n) -short n; +void initat(short n) { register struct asgent *ap; @@ -849,6 +839,5 @@ */ -setaux(aux) -register short aux; +void setaux(short aux) { register short psgdata; @@ -878,6 +867,5 @@ */ -getasg(n) -short n; +void getasg(short n) { register struct asgent *ap; @@ -933,6 +921,5 @@ */ -putasg(n) -short n; +void putasg(short n) { register struct asgent *ap; @@ -970,5 +957,5 @@ */ -awins() +void awins(void) { register short i; @@ -984,5 +971,5 @@ */ -inital() +void inital(void) { register short n; @@ -1005,5 +992,5 @@ */ -adbord() +void adbord(void) { point = adpoint; @@ -1036,5 +1023,5 @@ */ -asgdsp() +void asgdsp(void) { asgob = v_score; /* setup object pointer */ Index: ram/asgvce.c =================================================================== --- ram/asgvce.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/asgvce.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -84,5 +84,5 @@ */ -clrnl() +void clrnl(void) { register short i; @@ -116,7 +116,5 @@ */ -ne_end(trg, grp) -short trg; -register short grp; +void ne_end(short trg, short grp) { register short nn; @@ -272,6 +270,5 @@ */ -ne_bgn(grp, key, vel) -register short grp, key, vel; +void ne_bgn(short grp, short key, short vel) { register struct n_entry *ep; @@ -363,6 +360,5 @@ */ -showvel(g, v) -short g, v; +void showvel(short g, short v) { char buf[6]; @@ -388,6 +384,5 @@ */ -asgvce(grp, port, chan, key, vel) -short grp, port, chan, key, vel; +void asgvce(short grp, short port, short chan, short key, short vel) { register short i; Index: ram/barbadj.c =================================================================== --- ram/barbadj.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/barbadj.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -58,6 +58,5 @@ */ -BarBadj(bar, val) -short bar, val; +void BarBadj(short bar, short val) { register short bardot, barpos, curdif; @@ -143,6 +142,5 @@ */ -BarBset(bar, val) -short bar, val; +void BarBset(short bar, short val) { register short bardot, barpos, newbar; @@ -197,6 +195,5 @@ */ -BarCadj(bar, val) -short bar, val; +void BarCadj(short bar, short val) { register short bardot, barpos, newbar; @@ -289,6 +286,5 @@ */ -BarCset(bar, val) -short bar, val; +void BarCset(short bar, short val) { register short bardot, barpos, barloc1, barloc2; Index: ram/chgsef.c =================================================================== --- ram/chgsef.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/chgsef.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -35,5 +35,5 @@ */ -chgsef() +void chgsef(void) { register struct s_entry *ep; @@ -68,5 +68,5 @@ */ -chgseb() +void chgseb(void) { register struct s_entry *ep; @@ -101,5 +101,5 @@ */ -chgsdf() +void chgsdf(void) { register struct s_entry *ep; @@ -176,5 +176,5 @@ */ -chgsdb() +void chgsdb(void) { register struct s_entry *ep; Index: ram/chksec.c =================================================================== --- ram/chksec.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/chksec.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -167,7 +167,5 @@ */ -short -oktocm(ep) -register struct s_entry *ep; +short oktocm(struct s_entry *ep) { register short et, grp, mode; @@ -215,7 +213,5 @@ */ -short -oktode(ep) -register struct s_entry *ep; +short oktode(struct s_entry *ep) { register short et, grp, mode; @@ -262,7 +258,5 @@ */ -short -oktodg(ep) -register struct s_entry *ep; +short oktodg(struct s_entry *ep) { register short et, grp; @@ -300,7 +294,5 @@ */ -short -chksec(ns) -register short ns; +short chksec(short ns) { register struct s_entry *ep; @@ -373,6 +365,5 @@ */ -long -sizesec() +long sizesec(void) { register long ec; @@ -421,7 +412,5 @@ */ -edelta(ep, btime, delta) -register struct s_entry *ep; -register long btime, delta; +void edelta(struct s_entry *ep, long btime, long delta) { DB_ENTR("edelta"); @@ -458,8 +447,5 @@ */ -struct s_entry * -madjsec(sbp, btime) -register struct s_entry *sbp; -register long btime; +struct s_entry *madjsec(struct s_entry *sbp, long btime) { short ns, nv; @@ -589,6 +575,5 @@ */ -ehfix(cbp, cep) -register struct s_entry *cbp, *cep; +void ehfix(struct s_entry *cbp, struct s_entry *cep) { register short et; Index: ram/cminit.c =================================================================== --- ram/cminit.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/cminit.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -40,7 +40,5 @@ */ -int -CMinit(ip) -char *ip; +void CMinit(char *ip) { register int i; @@ -71,7 +69,5 @@ */ -int -CMchr(c) -char c; +int CMchr(char c) { CM_DBLK; @@ -94,7 +90,5 @@ */ -int -CMuchr(c) -register char c; +int CMuchr(char c) { register char t; @@ -129,7 +123,5 @@ */ -int -CMstr(s) -char *s; +int CMstr(char *s) { register char *t; @@ -165,7 +157,5 @@ */ -int -CMustr(s) -register char *s; +int CMustr(char *s) { register char *t, t1, t2; @@ -212,6 +202,5 @@ */ -int -CMlong() +int CMlong(void) { register char *p; @@ -260,6 +249,5 @@ */ -int -CMdig() +int CMdig(void) { register char c; @@ -290,7 +278,5 @@ */ -int -CMlist(l) -register char *l[]; +int CMlist(char *l[]) { register int n; @@ -332,7 +318,5 @@ */ -int -CMulist(l) -register char *l[]; +int CMulist(char *l[]) { register int n; @@ -373,7 +357,5 @@ */ -int -CMstat(msg) -char *msg; +int CMstat(char *msg) { register char *tp; Index: ram/ctcpos.c =================================================================== --- ram/ctcpos.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ctcpos.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -38,6 +38,5 @@ */ -ctcpos(row, col) -register short row, col; +void ctcpos(short row, short col) { register short nrow; @@ -71,5 +70,5 @@ */ -ctcoff() +void ctcoff(void) { if (v_regs[5] & 0x0180) /* point at the control bank */ @@ -88,5 +87,5 @@ */ -ctcon() +void ctcon(void) { if (v_regs[5] & 0x0180) /* point at the control bank */ @@ -110,6 +109,5 @@ */ -mtcpos(row, col) -register short row, col; +void mtcpos(short row, short col) { if (v_regs[5] & 0x0180) /* point at the control bank */ @@ -142,5 +140,5 @@ */ -mtcoff() +void mtcoff(void) { if (v_regs[5] & 0x0180) /* point at the control bank */ Index: ram/curset.c =================================================================== --- ram/curset.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/curset.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -34,5 +34,7 @@ short trkonly = FALSE; /* set TRUE to force use of trackball */ -extern short txstd(), tystd(), cmvgen(); +extern void txstd(void); +extern void tystd(void); +extern void cmvgen(void); extern short (*curmove)(); @@ -137,6 +139,5 @@ */ -short -stdctp0() +short stdctp0(void) { return(submenu ? CT_VIRT : CT_TEXT); @@ -149,6 +150,5 @@ */ -short -stdctp1() +short stdctp1(void) { if (submenu) @@ -164,6 +164,5 @@ */ -short -stdctp2() +short stdctp2(void) { return(CT_GRAF); @@ -180,6 +179,5 @@ */ -short -stdctp3() +short stdctp3(void) { if (submenu) @@ -195,6 +193,5 @@ */ -short -stdctp4() +short stdctp4(void) { if (submenu) @@ -210,6 +207,5 @@ */ -short -stdctp5() +short stdctp5(void) { return(submenu ? CT_MENU : CT_SMTH); @@ -226,6 +222,5 @@ */ -curset(s) -register struct curpak *s; +void curset(struct curpak *s) { #if DEBUGIT Index: ram/dbentr.c =================================================================== --- ram/dbentr.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/dbentr.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -75,6 +75,5 @@ */ -DB_Entr(str) -char *str; +void DB_Entr(char *str) { DB_Ents[DB_In].tag = DB_entr; /* tag an entry */ @@ -105,6 +104,5 @@ */ -DB_Exit(str) -char *str; +void DB_Exit(char *str) { DB_Ents[DB_In].tag = DB_exit; /* tag an exit */ @@ -138,6 +136,5 @@ */ -DB_Cmnt(str) -char *str; +void DB_Cmnt(char *str) { DB_Ents[DB_In].tag = DB_cmnt; /* tag a comment */ @@ -166,5 +163,5 @@ */ -DB_Clr() +void DB_Clr(void) { register short i; @@ -193,5 +190,5 @@ */ -DB_Dump() +void DB_Dump(void) { register short tag; Index: ram/dcopy.c =================================================================== --- ram/dcopy.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/dcopy.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -18,5 +18,5 @@ extern long p_dlen; /* size of data (from basepage) */ -extern Lo_RAM(); /* lowest address loaded (lowram.s) */ +extern void Lo_RAM(void); extern struct EXFILE mphead; /* MIDAS-VII program header */ @@ -32,6 +32,5 @@ */ -short -dcopy() +short dcopy(void) { register FILE *fp; Index: ram/dec2fr.c =================================================================== --- ram/dec2fr.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/dec2fr.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -42,7 +42,5 @@ */ -short -dec2fr(s) -register char *s; +short dec2fr(char *s) { register short i; @@ -107,8 +105,5 @@ */ -char * -fr2dec(v, s) -register short v; -register char *s; +char *fr2dec(short v, char *s) { register long acc, sc; Index: ram/delnote.c =================================================================== --- ram/delnote.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/delnote.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -38,6 +38,5 @@ */ -short -delnote() +short delnote(void) { register struct n_entry *bp, *cp, *ep; Index: ram/delpnts.c =================================================================== --- ram/delpnts.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/delpnts.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -49,6 +49,5 @@ */ -short -delpnts() +short delpnts(void) { register struct instpnt *pp; @@ -244,8 +243,5 @@ */ -short -inspnt(ip, fn, inpnt) -register struct instdef *ip; -short fn, inpnt; +short inspnt(struct instdef *ip, short fn, short inpnt) { register char *fp1, *fp2; Index: ram/dformat.c =================================================================== --- ram/dformat.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/dformat.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -49,7 +49,5 @@ */ -short -dformat(dt) -short dt; +short dformat(short dt) { register short trk; Index: ram/dopatch.c =================================================================== --- ram/dopatch.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/dopatch.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -113,6 +113,5 @@ */ -pdows(slot, voice, wsn) -short slot, voice, wsn; +void pdows(short slot, short voice, short wsn) { unsigned short *fpuws; @@ -159,6 +158,5 @@ */ -pfpufn(voice, par, dat1, dat2) -unsigned short voice, par, dat1, dat2; +void pfpufn(unsigned short voice, unsigned short par, unsigned short dat1, unsigned short dat2) { register unsigned short *fpu; @@ -211,6 +209,5 @@ */ -pdoctl(voice, osc, dat1, dat2) -register short voice, osc, dat1, dat2; +void pdoctl(short voice, short osc, short dat1, short dat2) { register struct instdef *ip; @@ -231,6 +228,5 @@ */ -dopatch(pp) -register struct patch *pp; +void dopatch(struct patch *pp) { register unsigned short suba, dat1, dat2; Index: ram/enterit.c =================================================================== --- ram/enterit.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/enterit.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -72,5 +72,5 @@ */ -enterit() +void enterit(void) { if (NOT astat) /* only on closures */ @@ -110,6 +110,5 @@ */ -short -nokey() +short nokey(void) { return(FALSE); @@ -126,5 +125,5 @@ */ -cmvgen() +void cmvgen(void) { register short nc, newrow, newcol, newpos; @@ -234,7 +233,5 @@ */ -short -crxrate(cv) -register short cv; +short crxrate(short cv) { register short cs; @@ -269,7 +266,5 @@ */ -short -cryrate(cv) -register short cv; +short cryrate(short cv) { register short cs; @@ -304,5 +299,5 @@ */ -cmfix() +void cmfix(void) { register short acx, acy, scx, scy; @@ -358,5 +353,5 @@ */ -cxkstd() +void cxkstd(void) { trkball = FALSE; @@ -421,5 +416,5 @@ */ -cykstd() +void cykstd(void) { trkball = FALSE; @@ -484,5 +479,5 @@ */ -stdmkey() +void stdmkey(void) { if (astat) { @@ -499,5 +494,5 @@ */ -stddkey() +void stddkey(void) { if (infield(stcrow, stccol, curfet)) { @@ -530,5 +525,5 @@ */ -cxgen() +void cxgen(void) { cxval += cxrate; @@ -548,5 +543,5 @@ */ -cygen() +void cygen(void) { cyval += cyrate; Index: ram/etaccn.c =================================================================== --- ram/etaccn.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etaccn.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -15,5 +15,5 @@ #include "asgdsp.h" -extern char *numblk(); +extern char *numblk(char *buf, short n); extern unsigned *asgob; @@ -37,7 +37,5 @@ */ -short -et_accn(n) -short n; +short et_accn(short n) { register short ctl; @@ -59,7 +57,5 @@ */ -short -ef_accn(n) -short n; +short ef_accn(short n) { register short tmpval, ctl, i; @@ -105,7 +101,5 @@ */ -short -rd_accn(nn) -short nn; +short rd_accn(short nn) { register short n, ctl; @@ -133,8 +127,5 @@ */ -short -nd_accn(nn, k) -short nn; -register short k; +short nd_accn(short nn, short k) { register short n; Index: ram/etadep.c =================================================================== --- ram/etadep.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etadep.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -34,7 +34,5 @@ */ -short -et_adep(n) -short n; +short et_adep(short n) { sprintf(ebuf, "%02d", ps_dpth); @@ -50,7 +48,5 @@ */ -short -ef_adep(n) -short n; +short ef_adep(short n) { register short i, tmpval; @@ -79,7 +75,5 @@ */ -short -rd_adep(nn) -short nn; +short rd_adep(short nn) { register short n; @@ -101,8 +95,5 @@ */ -short -nd_adep(nn, k) -short nn; -register short k; +short nd_adep(short nn, short k) { register short ec, n; Index: ram/etadyn.c =================================================================== --- ram/etadyn.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etadyn.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -18,5 +18,5 @@ #include "instdsp.h" -extern short setsr(); +extern unsigned setsr(unsigned sr); extern unsigned *asgob; @@ -50,7 +50,5 @@ */ -short -et_adyn(n) -short n; +short et_adyn(short n) { register short grp; @@ -76,6 +74,5 @@ */ -setdyn(grp, dyn) -short grp, dyn; +void setdyn(short grp, short dyn) { register short g, i, val; @@ -142,7 +139,5 @@ */ -short -ef_adyn(n) -short n; +short ef_adyn(short n) { register short dyn, grp; @@ -170,7 +165,5 @@ */ -short -rd_adyn(nn) -short nn; +short rd_adyn(short nn) { register short n, grp; @@ -195,8 +188,5 @@ */ -short -nd_adyn(nn, k) -short nn; -register short k; +short nd_adyn(short nn, short k) { register short n; Index: ram/etagch.c =================================================================== --- ram/etagch.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etagch.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -15,5 +15,5 @@ #include "asgdsp.h" -extern char *numblk(); +extern char *numblk(char *buf, short n); extern unsigned *asgob; @@ -38,7 +38,5 @@ */ -short -et_agch(n) -short n; +short et_agch(short n) { register short grp; @@ -60,7 +58,5 @@ */ -short -ef_agch(n) -short n; +short ef_agch(short n) { register short tmpval, grp, i; @@ -106,7 +102,5 @@ */ -short -rd_agch(nn) -short nn; +short rd_agch(short nn) { register short n, grp; @@ -129,8 +123,5 @@ */ -short -nd_agch(nn, k) -short nn; -register short k; +short nd_agch(short nn, short k) { register short n; Index: ram/etagpt.c =================================================================== --- ram/etagpt.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etagpt.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -15,5 +15,5 @@ #include "asgdsp.h" -extern char *numblk(); +extern char *numblk(char *buf, short n); extern unsigned *asgob; @@ -41,7 +41,5 @@ */ -short -et_agpt(n) -short n; +short et_agpt(short n) { register short grp; @@ -63,7 +61,5 @@ */ -short -ef_agpt(n) -short n; +short ef_agpt(short n) { register short tmpval, grp, i; @@ -96,7 +92,5 @@ */ -short -rd_agpt(nn) -short nn; +short rd_agpt(short nn) { register short n, grp; @@ -118,8 +112,5 @@ */ -short -nd_agpt(nn, k) -short nn; -register short k; +short nd_agpt(short nn, short k) { register short n; Index: ram/etains.c =================================================================== --- ram/etains.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etains.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -15,5 +15,5 @@ #include "asgdsp.h" -extern char *numblk(); +extern char *numblk(char *buf, short n); extern unsigned *asgob; @@ -39,5 +39,5 @@ */ -modasg() +void modasg(void) { if (NOT asgmod) { @@ -54,7 +54,5 @@ */ -short -et_ains(n) -short n; +short et_ains(short n) { register short grp; @@ -76,7 +74,5 @@ */ -short -ef_ains(n) -short n; +short ef_ains(short n) { register short tmpval, grp, i; @@ -110,7 +106,5 @@ */ -short -rd_ains(nn) -short nn; +short rd_ains(short nn) { register short n, grp; @@ -135,8 +129,5 @@ */ -short -nd_ains(nn, k) -short nn; -register short k; +short nd_ains(short nn, short k) { register short n; Index: ram/etaint.c =================================================================== --- ram/etaint.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etaint.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -34,7 +34,5 @@ */ -short -et_aint(n) -short n; +short et_aint(short n) { sprintf(ebuf, "%02d", ps_intn); @@ -50,7 +48,5 @@ */ -short -ef_aint(n) -short n; +short ef_aint(short n) { register short i, tmpval; @@ -79,7 +75,5 @@ */ -short -rd_aint(nn) -short nn; +short rd_aint(short nn) { register short n; @@ -101,8 +95,5 @@ */ -short -nd_aint(nn, k) -short nn; -register short k; +short nd_aint(short nn, short k) { register short ec, n; Index: ram/etaopt.c =================================================================== --- ram/etaopt.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etaopt.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -36,7 +36,5 @@ */ -short -et_aopt(n) -short n; +short et_aopt(short n) { sprintf(ebuf, "%01.1d", curmop); @@ -52,7 +50,5 @@ */ -short -ef_aopt(n) -short n; +short ef_aopt(short n) { register short tmpval; @@ -81,7 +77,5 @@ */ -short -rd_aopt(nn) -short nn; +short rd_aopt(short nn) { register short n; @@ -102,8 +96,5 @@ */ -short -nd_aopt(nn, k) -short nn; -register short k; +short nd_aopt(short nn, short k) { register short n; Index: ram/etaprg.c =================================================================== --- ram/etaprg.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etaprg.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -40,7 +40,5 @@ */ -short -et_aprg(n) -short n; +short et_aprg(short n) { sprintf(ebuf, "%02d", prgchan); @@ -56,7 +54,5 @@ */ -short -ef_aprg(n) -short n; +short ef_aprg(short n) { register short i, tmpval; @@ -92,7 +88,5 @@ */ -short -rd_aprg(nn) -short nn; +short rd_aprg(short nn) { register short n; @@ -114,8 +108,5 @@ */ -short -nd_aprg(nn, k) -short nn; -register short k; +short nd_aprg(short nn, short k) { register short ec, n; Index: ram/etarat.c =================================================================== --- ram/etarat.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etarat.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -34,7 +34,5 @@ */ -short -et_arat(n) -short n; +short et_arat(short n) { sprintf(ebuf, "%02d", ps_rate); @@ -50,7 +48,5 @@ */ -short -ef_arat(n) -short n; +short ef_arat(short n) { register short i, tmpval; @@ -79,7 +75,5 @@ */ -short -rd_arat(nn) -short nn; +short rd_arat(short nn) { register short n; @@ -101,8 +95,5 @@ */ -short -nd_arat(nn, k) -short nn; -register short k; +short nd_arat(short nn, short k) { register short ec, n; Index: ram/etatab.c =================================================================== --- ram/etatab.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etatab.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -16,5 +16,5 @@ #include "asgdsp.h" -extern short adpoint(); +extern void adpoint(short x, short y, short pen); extern short (*point)(); @@ -41,7 +41,5 @@ */ -short -et_atab(n) -short n; +short et_atab(short n) { sprintf(ebuf, "%02d", curasg); @@ -57,7 +55,5 @@ */ -short -ef_atab(n) -short n; +short ef_atab(short n) { register short i, tmpval; @@ -92,7 +88,5 @@ */ -short -rd_atab(nn) -short nn; +short rd_atab(short nn) { register short n; @@ -120,8 +114,5 @@ */ -short -nd_atab(nn, k) -short nn; -register short k; +short nd_atab(short nn, short k) { register short ec, n; Index: ram/etatun.c =================================================================== --- ram/etatun.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etatun.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -34,7 +34,5 @@ */ -short -et_atun(n) -short n; +short et_atun(short n) { sprintf(ebuf, "%01.1d", curtun); @@ -50,7 +48,5 @@ */ -short -ef_atun(n) -short n; +short ef_atun(short n) { register short tmpval; @@ -77,7 +73,5 @@ */ -short -rd_atun(nn) -short nn; +short rd_atun(short nn) { register short n; @@ -99,8 +93,5 @@ */ -short -nd_atun(nn, k) -short nn; -register short k; +short nd_atun(short nn, short k) { register short n; Index: ram/etavgr.c =================================================================== --- ram/etavgr.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etavgr.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -21,5 +21,5 @@ #endif -extern char *numblk(); +extern char *numblk(char *buf, short n); extern unsigned *asgob; @@ -44,7 +44,5 @@ */ -short -et_avgr(nn) -short nn; +short et_avgr(short nn) { register short grp; @@ -74,7 +72,5 @@ */ -short -ef_avgr(nn) -short nn; +short ef_avgr(short nn) { register short tmpval, vce, i; @@ -128,7 +124,5 @@ */ -short -rd_avgr(nn) -short nn; +short rd_avgr(short nn) { register short n, grp; @@ -155,8 +149,5 @@ */ -short -nd_avgr(nn, k) -short nn; -register short k; +short nd_avgr(short nn, short k) { register short n, col; Index: ram/etdyn.c =================================================================== --- ram/etdyn.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etdyn.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -33,7 +33,5 @@ */ -short -et_dyn(n) -short n; +short et_dyn(short n) { ebuf[0] =grpdyn[n] + '0'; @@ -53,7 +51,5 @@ */ -short -ef_dyn(n) -short n; +short ef_dyn(short n) { register short ival; @@ -99,7 +95,5 @@ */ -short -rd_dyn(n) -short n; +short rd_dyn(short n) { if (v_regs[5] & 0x0180) @@ -117,5 +111,5 @@ */ -ds_dyn() +void ds_dyn(void) { register short i; @@ -135,7 +129,5 @@ */ -short -nd_dyn(n, k) -register short n, k; +short nd_dyn(short n, short k) { ebuf[0] = k + '0'; Index: ram/etiact.c =================================================================== --- ram/etiact.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etiact.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -20,7 +20,7 @@ /* functions defined elsewhere */ -extern int advicur(); - -extern char *strcpy(); +extern void advicur(void); + +extern char *strcpy(char *s1, char *s2); /* variables defined elsewhere */ @@ -49,7 +49,5 @@ */ -short -et_iact(nn) -short nn; +short et_iact(short nn) { register struct instpnt *pp; @@ -101,7 +99,5 @@ */ -short -ef_iact(nn) -short nn; +short ef_iact(short nn) { register short i, tmp1, tmp2; @@ -209,7 +205,5 @@ */ -short -rd_iact(nn) -short nn; +void rd_iact(short nn) { register short pnt, par, n; @@ -300,6 +294,5 @@ */ -setactb(n) -short n; +void setactb(short n) { register char *s1; @@ -389,7 +382,5 @@ */ -short -nd_iact(nn, k) -short nn, k; +short nd_iact(short nn, short k) { register short n, ec; Index: ram/eticnf.c =================================================================== --- ram/eticnf.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/eticnf.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -38,7 +38,5 @@ */ -short -et_icnf(n) -short n; +short et_icnf(short n) { sprintf(ebuf, "%02d", vbufs[curvce].idhcfg); @@ -58,7 +56,5 @@ */ -short -ef_icnf(n) -short n; +short ef_icnf(short n) { register short i, tmpval; @@ -92,7 +88,5 @@ */ -short -rd_icnf(n) -short n; +short rd_icnf(short n) { sprintf(dspbuf, "%02d", vbufs[curvce].idhcfg); /* convert */ @@ -117,8 +111,5 @@ */ -short -nd_icnf(n, k) -short n; -register short k; +short nd_icnf(short n, short k) { register short ec, c; Index: ram/etidin.c =================================================================== --- ram/etidin.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etidin.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -42,7 +42,5 @@ */ -short -et_idin(n) -short n; +short et_idin(short n) { sprintf(ebuf, "%02d", curinst); @@ -59,7 +57,5 @@ */ -short -ef_idin(n) -short n; +short ef_idin(short n) { register short i, tmpval, j; @@ -165,7 +161,5 @@ */ -short -rd_idin(n) -short n; +short rd_idin(short n) { if (idcfsw) /* don't display if copy/fetch is up */ @@ -194,8 +188,5 @@ */ -short -nd_idin(n, k) -short n; -register short k; +short nd_idin(short n, short k) { register short ec, c; Index: ram/etimlt.c =================================================================== --- ram/etimlt.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etimlt.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -24,7 +24,11 @@ #endif -extern short advicur(), dec2fr(), dswin(), idvlbld(), ttcpos(); - -extern char *fr2dec(); +extern void advicur(void); +extern short dec2fr(char *s); +extern void dswin(short n); +extern void idvlbld(void); +extern void ttcpos(short row, short col); + +extern char *fr2dec(short v, char *s); extern unsigned *instob; @@ -53,9 +57,5 @@ */ -char * -dsimlt(buf, src, mltval) -char *buf; -short src; -register short mltval; +char *dsimlt(char *buf, short src, short mltval) { char mltstr[5], mlttmp[5]; @@ -95,7 +95,5 @@ */ -short -et_imlt(n) -short n; +short et_imlt(short n) { register struct instdef *ip; @@ -129,7 +127,5 @@ */ -short -ef_imlt(n) -short n; +short ef_imlt(short n) { register short i, tmpval, srctmp; @@ -245,7 +241,5 @@ */ -short -rd_imlt(n) -short n; +short rd_imlt(short n) { register struct instdef *ip; @@ -273,8 +267,5 @@ */ -short -nd_imlt(n, k) -short n; -register short k; +short nd_imlt(short n, short k) { register short ec; Index: ram/etinst.c =================================================================== --- ram/etinst.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etinst.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -37,7 +37,5 @@ */ -short -et_inst(n) -short n; +short et_inst(short n) { sprintf(ebuf, "%02.2d", ins2grp[n] & 0x00FF); @@ -57,7 +55,5 @@ */ -short -ef_inst(n) -short n; +short ef_inst(short n) { register short ival; @@ -108,7 +104,5 @@ */ -short -rd_inst(n) -short n; +short rd_inst(short n) { char buf[4]; @@ -130,5 +124,5 @@ */ -ds_inst() +void ds_inst(void) { register short i; @@ -148,7 +142,5 @@ */ -short -nd_inst(n, k) -register short n, k; +short nd_inst(short n, short k) { register short ec; Index: ram/etioas.c =================================================================== --- ram/etioas.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etioas.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -19,5 +19,6 @@ #include "scdsp.h" -extern unsigned fromfpu(), tofpu(); +extern unsigned fromfpu(unsigned fputime); +extern unsigned tofpu(unsigned time); extern unsigned *obj8; @@ -51,7 +52,5 @@ */ -short -et_ioas(n) -short n; +short et_ioas(short n) { sprintf(ebuf, "%02.2d", curasg); @@ -70,7 +69,5 @@ */ -short -ef_ioas(n) -short n; +short ef_ioas(short n) { register short ival; @@ -120,7 +117,5 @@ */ -short -rd_ioas(n) -short n; +short rd_ioas(short n) { sprintf(dspbuf, "%02.2d", curasg); @@ -139,7 +134,5 @@ */ -short -nd_ioas(n, k) -short n, k; +short nd_ioas(short n, short k) { register short ec; @@ -172,7 +165,5 @@ */ -short -et_tune(n) -short n; +short et_tune(short n) { ebuf[0] = '0' + curtun; @@ -192,7 +183,5 @@ */ -short -ef_tune(n) -short n; +short ef_tune(short n) { register short ival; @@ -236,7 +225,5 @@ */ -short -rd_tune(n) -short n; +short rd_tune(short n) { if (v_regs[5] & 0x0180) @@ -254,7 +241,5 @@ */ -short -nd_tune(n, k) -short n, k; +short nd_tune(short n, short k) { register short ec; @@ -286,7 +271,5 @@ */ -short -et_tmpo(n) -short n; +short et_tmpo(short n) { sprintf(ebuf, "%03.3d", tmpoval); @@ -306,7 +289,5 @@ */ -short -ef_tmpo(n) -short n; +short ef_tmpo(short n) { register short ival; @@ -356,7 +337,5 @@ */ -short -rd_tmpo(n) -short n; +short rd_tmpo(short n) { sprintf(dspbuf, "%03.3d", tmpoval); @@ -376,7 +355,5 @@ */ -short -nd_tmpo(n, k) -register short n, k; +short nd_tmpo(short n, short k) { register short ec; @@ -410,7 +387,5 @@ */ -short -et_intp(n) -short n; +short et_intp(short n) { register short th, tl; @@ -435,7 +410,5 @@ */ -short -ef_intp(n) -short n; +short ef_intp(short n) { register short i; @@ -495,7 +468,5 @@ */ -short -rd_intp(n) -short n; +short rd_intp(short n) { register short th, tl; @@ -523,7 +494,5 @@ */ -short -nd_intp(n, k) -short n, k; +short nd_intp(short n, short k) { register short ec; Index: ram/etiosc.c =================================================================== --- ram/etiosc.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etiosc.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -19,7 +19,8 @@ /* functions defined elsewhere */ -extern int advicur(), dosync(); - -extern char *strcpy(); +extern void advicur(void); +extern void dosync(short vce); + +extern char *strcpy(char *s1, char *s2); /* variables defined elsewhere */ @@ -76,6 +77,5 @@ */ -int2rat(rat) -short rat; +void int2rat(short rat) { register short den, inum, num; @@ -112,7 +112,5 @@ */ -cnvc2p(buf, cv) -char *buf; -short cv; +void cnvc2p(char *buf, short cv) { short rem, tmp; @@ -149,6 +147,5 @@ */ -short -cnvp2c() +short cnvp2c(void) { if (ebuf[0] EQ 9) /* high limit is C9 00 */ @@ -177,7 +174,5 @@ */ -short -et_iosc(nn) -short nn; +short et_iosc(short nn) { register struct instdef *ip; @@ -261,7 +256,5 @@ */ -setoval(ip, v, val) -register struct instdef *ip; -register short v, val; +void setoval(struct instdef *ip, short v, short val) { switch (v) { @@ -306,7 +299,5 @@ */ -short -ef_iosc(nn) -short nn; +short ef_iosc(short nn) { register struct instdef *ip; @@ -380,7 +371,5 @@ */ -short -rd_iosc(nn) -short nn; +short rd_iosc(short nn) { register struct instdef *ip; @@ -482,6 +471,5 @@ */ -setoscb(n, v) -short n, v; +void setoscb(short n, short v) { register struct instdef *ip; @@ -602,6 +590,5 @@ */ -setosyn(n, v, t) -short n, v, t; +void setosyn(short n, short v, short t) { register struct instdef *ip; @@ -656,7 +643,5 @@ */ -short -nd_iosc(nn, k) -short nn, k; +short nd_iosc(short nn, short k) { register short v, n; Index: ram/etipnt.c =================================================================== --- ram/etipnt.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etipnt.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -17,5 +17,9 @@ #include "instdsp.h" -extern short advicur(), pntsel(), showpt(), timeto(), setseg(); +extern void advicur(void); +extern void pntsel(void); +extern void showpt(short q); +extern short timeto(short fn, short pj); +extern void setseg(short pn, unsigned ptime); extern unsigned *instob; @@ -41,7 +45,5 @@ */ -short -et_ipnt(n) -short n; +short et_ipnt(short n) { sprintf(ebuf, "%02d", subj); @@ -61,7 +63,5 @@ */ -short -ef_ipnt(n) -short n; +short ef_ipnt(short n) { register short i, tmpval, endpnt, basept; @@ -147,7 +147,5 @@ */ -short -rd_ipnt(n) -short n; +short rd_ipnt(short n) { sprintf(dspbuf, "%02d", subj); /* convert to ASCII */ @@ -171,8 +169,5 @@ */ -short -nd_ipnt(n, k) -short n; -register short k; +short nd_ipnt(short n, short k) { register short ec; Index: ram/etires.c =================================================================== --- ram/etires.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etires.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -54,7 +54,5 @@ */ -short -et_ires(n) -short n; +short et_ires(short n) { if (curfunc NE 4) @@ -73,7 +71,5 @@ */ -short -ef_ires(n) -short n; +short ef_ires(short n) { register short tmpval; @@ -101,7 +97,5 @@ */ -short -rd_ires(n) -short n; +short rd_ires(short n) { register struct idfnhdr *fp; @@ -134,8 +128,5 @@ */ -short -nd_ires(n, k) -short n; -register short k; +short nd_ires(short n, short k) { if (curfunc NE 4) Index: ram/etitim.c =================================================================== --- ram/etitim.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etitim.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -17,5 +17,7 @@ #include "instdsp.h" -extern short advicur(), edfunc(), pntsel(); +extern void advicur(void); +extern short edfunc(short n); +extern void pntsel(void); extern unsigned *instob; @@ -42,7 +44,5 @@ */ -short -et_itim(n) -short n; +short et_itim(short n) { register short th, tl; @@ -77,7 +77,5 @@ */ -short -ef_itim(n) -short n; +short ef_itim(short n) { register short i, endpnt, basept; @@ -135,7 +133,5 @@ */ -short -rd_itim(n) -short n; +short rd_itim(short n) { register short th, tl; @@ -168,8 +164,5 @@ */ -short -nd_itim(n, k) -short n; -register short k; +short nd_itim(short n, short k) { register short ec; Index: ram/etival.c =================================================================== --- ram/etival.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etival.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -23,7 +23,10 @@ #endif -extern short advicur(), edfunc(), dec2fr(); - -extern char *dsimlt(), *fr2dec(); +extern void advicur(void); +extern short edfunc(short n); +extern short dec2fr(char *s); + +extern char *dsimlt(char *buf, short src, short mltval); +extern char *fr2dec(short v, char *s); extern unsigned *instob; @@ -49,7 +52,5 @@ */ -short -et_ival(n) -short n; +short et_ival(short n) { register short vv, vh, vl; @@ -83,7 +84,5 @@ */ -short -ef_ival(n) -short n; +short ef_ival(short n) { register short i, tmpval, srctmp; @@ -227,7 +226,5 @@ */ -short -rd_ival(n) -short n; +short rd_ival(short n) { register short vv, vh, vl; @@ -258,8 +255,5 @@ */ -short -nd_ival(n, k) -short n; -register short k; +short nd_ival(short n, short k) { if (idsrcsw) /* not in source menu */ Index: ram/etivce.c =================================================================== --- ram/etivce.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etivce.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -17,5 +17,6 @@ #define VCE_OFF 6 -extern short advicur(), newvce(); +extern void advicur(void); +extern void newvce(short voice); extern unsigned *instob; @@ -37,7 +38,5 @@ */ -short -et_ivce(n) -short n; +short et_ivce(short n) { sprintf(ebuf, "%02d", curvce + 1); @@ -57,7 +56,5 @@ */ -short -ef_ivce(n) -short n; +short ef_ivce(short n) { register short i, tmpval; @@ -89,7 +86,5 @@ */ -short -rd_ivce(n) -short n; +short rd_ivce(short n) { /* convert to ASCII */ @@ -115,8 +110,5 @@ */ -short -nd_ivce(n, k) -short n; -register short k; +short nd_ivce(short n, short k) { register short ec; Index: ram/etiwsn.c =================================================================== --- ram/etiwsn.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etiwsn.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -38,7 +38,5 @@ */ -short -et_iwsn(nn) -short nn; +short et_iwsn(short nn) { register short m; @@ -63,7 +61,5 @@ */ -short -ef_iwsn(nn) -short nn; +short ef_iwsn(short nn) { register short i, tmpval, m; @@ -129,7 +125,5 @@ */ -short -rd_iwsn(nn) -short nn; +short rd_iwsn(short nn) { register short m, n; @@ -159,8 +153,5 @@ */ -short -nd_iwsn(nn, k) -short nn; -register short k; +short nd_iwsn(short nn, short k) { register short ec, c, n; Index: ram/etloc.c =================================================================== --- ram/etloc.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etloc.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -20,5 +20,5 @@ #include "instdsp.h" -extern short setsr(); +extern unsigned setsr(unsigned sr); extern unsigned *obj8; @@ -53,7 +53,5 @@ */ -short -et_loc(n) -short n; +short et_loc(short n) { ebuf[0] =grploc[n] + 1 + '0'; @@ -73,6 +71,5 @@ */ -setloc(grp, loc) -short grp, loc; +void setloc(short grp, short loc) { register short g, i, val; @@ -140,7 +137,5 @@ */ -short -ef_loc(n) -short n; +short ef_loc(short n) { register short ival; @@ -191,7 +186,5 @@ */ -short -rd_loc(n) -short n; +short rd_loc(short n) { if (v_regs[5] & 0x0180) @@ -209,5 +202,5 @@ */ -ds_loc() +void ds_loc(void) { register short i; @@ -227,7 +220,5 @@ */ -short -nd_loc(n, k) -register short n, k; +short nd_loc(short n, short k) { ebuf[0] = k + '0'; Index: ram/etmcfn.c =================================================================== --- ram/etmcfn.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etmcfn.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -44,7 +44,5 @@ */ -short -et_mcfn(n) -short n; +short et_mcfn(short n) { sprintf(ebuf, "%02d", vbufs[curvce].idhcfg); @@ -64,7 +62,5 @@ */ -short -ef_mcfn(n) -short n; +short ef_mcfn(short n) { register short tmpval; @@ -95,7 +91,5 @@ */ -short -rd_mcfn(n) -short n; +short rd_mcfn(short n) { sprintf(dspbuf, "%02d", vbufs[curvce].idhcfg); @@ -119,8 +113,5 @@ */ -short -nd_mcfn(n, k) -short n; -register short k; +short nd_mcfn(short n, short k) { register short ec, c; @@ -155,7 +146,5 @@ */ -short -et_mwsn(nn) -short nn; +short et_mwsn(short nn) { wmcsel = (nn & 0xFF00) ? 1 : 0; @@ -179,7 +168,5 @@ */ -short -ef_mwsn(nn) -short nn; +short ef_mwsn(short nn) { register short tmpval; @@ -247,7 +234,5 @@ */ -short -rd_mwsn(nn) -short nn; +short rd_mwsn(short nn) { wmcsel = (nn & 0xFF00) ? 1 : 0; @@ -274,8 +259,5 @@ */ -short -nd_mwsn(nn, k) -short nn; -register short k; +short nd_mwsn(short nn, short k) { register short ec, c; Index: ram/etrel.c =================================================================== --- ram/etrel.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etrel.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -9,24 +9,20 @@ #include "stddefs.h" -short -et_rel() +short et_rel(void) { return(FAILURE); } -short -ef_rel() +short ef_rel(void) { return(FAILURE); } -short -rd_rel() +short rd_rel(void) { return(FAILURE); } -short -nd_rel() +short nd_rel(void) { return(FAILURE); Index: ram/etres1.c =================================================================== --- ram/etres1.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etres1.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -43,7 +43,5 @@ */ -short -et_res1(n) -short n; +short et_res1(short n) { ebuf[0] = anrs[n][abs(angroup)-1]; @@ -62,7 +60,5 @@ */ -short -ef_res1(n) -short n; +short ef_res1(short n) { register short ival, grp, vg; @@ -114,7 +110,5 @@ */ -short -rd_res1(n) -short n; +short rd_res1(short n) { register short grp, chr; @@ -142,7 +136,5 @@ */ -short -nd_res1(n, k) -short n, k; +short nd_res1(short n, short k) { ebuf[0] = k; @@ -166,7 +158,5 @@ */ -short -et_aval(n) -short n; +short et_aval(short n) { register short val, grp, gs; @@ -208,7 +198,5 @@ */ -short -ef_aval(n) -short n; +short ef_aval(short n) { register short val, grp, src, vg; @@ -265,7 +253,5 @@ */ -short -rd_aval(n) -short n; +short rd_aval(short n) { register short grp, val, gs; @@ -313,7 +299,5 @@ */ -short -nd_aval(n, k) -register short n, k; +short nd_aval(short n, short k) { register short ec; @@ -357,7 +341,5 @@ */ -short -et_agrp(n) -short n; +short et_agrp(short n) { sprintf(ebuf, "%02.2d", abs(angroup)); @@ -376,7 +358,5 @@ */ -short -ef_agrp(n) -short n; +short ef_agrp(short n) { register short ival; @@ -406,7 +386,5 @@ */ -short -rd_agrp(n) -short n; +short rd_agrp(short n) { char buf[4]; @@ -432,7 +410,5 @@ */ -short -nd_agrp(n, k) -short n, k; +short nd_agrp(short n, short k) { register short ec; Index: ram/etscor.c =================================================================== --- ram/etscor.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etscor.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -31,6 +31,5 @@ */ -short -et_scor() +short et_scor(void) { sprintf(ebuf, "%02.2d", curscor + 1); @@ -50,6 +49,5 @@ */ -short -ef_scor() +short ef_scor(void) { register short ival; @@ -80,6 +78,5 @@ */ -short -rd_scor() +short rd_scor(void) { sprintf(dspbuf, "%02.2d", curscor + 1); @@ -103,7 +100,5 @@ */ -short -nd_scor(n, k) -short n, k; +short nd_scor(short n, short k) { register short ec; Index: ram/etsnbt.c =================================================================== --- ram/etsnbt.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etsnbt.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -35,7 +35,5 @@ */ -short -et_snbt(n) -short n; +short et_snbt(short n) { register long curfr, beat; @@ -62,7 +60,5 @@ */ -short -ef_snbt(n) -short n; +short ef_snbt(short n) { register long ival; @@ -99,7 +95,5 @@ */ -short -rd_snbt(n) -short n; +short rd_snbt(short n) { register long curfr, beat; @@ -128,7 +122,5 @@ */ -short -nd_snbt(n, k) -register short n, k; +short nd_snbt(short n, short k) { register short ec; Index: ram/etstrn.c =================================================================== --- ram/etstrn.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etstrn.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -35,6 +35,5 @@ */ -short -et_strn() +short et_strn(void) { sprintf(ebuf, "%c%02d", grptran < 0 ? '-' : '+', abs(grptran)); @@ -55,6 +54,5 @@ */ -short -ef_strn() +short ef_strn(void) { register short ival; @@ -79,6 +77,5 @@ */ -short -rd_strn() +short rd_strn(void) { sprintf(dspbuf, "%c%02d", grptran < 0 ? '-' : '+', abs(grptran)); @@ -102,7 +99,5 @@ */ -short -nd_strn(n, k) -short n, k; +short nd_strn(short n, short k) { register short ec; Index: ram/ettpch.c =================================================================== --- ram/ettpch.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ettpch.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -20,5 +20,5 @@ /* functions defined elsewhere */ -extern short cnvp2c(); +extern short cnvp2c(void); /* variables defined elsewhere */ @@ -49,7 +49,5 @@ */ -short -loc2key(row, col) -short row, col; +short loc2key(short row, short col) { if (row EQ 24) { @@ -105,7 +103,5 @@ */ -short -et_tpch(nn) -short nn; +short et_tpch(short nn) { register short key, val; @@ -132,7 +128,5 @@ */ -short -ef_tpch(nn) -short nn; +short ef_tpch(short nn) { register short key; @@ -162,7 +156,5 @@ */ -short -rd_tpch(nn) -short nn; +short rd_tpch(short nn) { register short val, key, n; @@ -200,7 +192,5 @@ */ -short -nd_tpch(nn, k) -short nn, k; +short nd_tpch(short nn, short k) { register short col, n; Index: ram/ettrns.c =================================================================== --- ram/ettrns.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ettrns.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -20,5 +20,5 @@ #include "scdsp.h" -extern short advscur(); +extern void advscur(void); extern unsigned *obj8; @@ -44,7 +44,5 @@ */ -short -et_trns(n) -short n; +short et_trns(short n) { register short trval; @@ -84,7 +82,5 @@ */ -short -ef_trns(n) -short n; +short ef_trns(short n) { register short i, trval; @@ -150,7 +146,5 @@ */ -short -rd_trns(n) -short n; +short rd_trns(short n) { register short trval, i; @@ -213,5 +207,5 @@ */ -ds_trns() +void ds_trns(void) { register short i; @@ -231,8 +225,5 @@ */ -short -nd_trns(n, k) -short n; -register short k; +short nd_trns(short n, short k) { register short ec, c, advsw; Index: ram/etttab.c =================================================================== --- ram/etttab.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etttab.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -34,7 +34,5 @@ */ -short -et_ttab(n) -short n; +short et_ttab(short n) { sprintf(ebuf, "%d", curtun); @@ -50,7 +48,5 @@ */ -short -ef_ttab(n) -short n; +short ef_ttab(short n) { register short i, tmpval; @@ -75,7 +71,5 @@ */ -short -rd_ttab(nn) -short nn; +short rd_ttab(short nn) { register short n; @@ -97,8 +91,5 @@ */ -short -nd_ttab(nn, k) -short nn; -register short k; +short nd_ttab(short nn, short k) { register short n; Index: ram/ettval.c =================================================================== --- ram/ettval.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ettval.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -34,5 +34,5 @@ */ -modtun() +void modtun(void) { if (NOT tunmod) { @@ -53,7 +53,5 @@ */ -short -et_tval(n) -short n; +short et_tval(short n) { register short tv; @@ -79,7 +77,5 @@ */ -short -ef_tval(n) -short n; +short ef_tval(short n) { register short *ov; @@ -121,7 +117,5 @@ */ -short -rd_tval(nn) -short nn; +short rd_tval(short nn) { register short tv, n; @@ -150,8 +144,5 @@ */ -short -nd_tval(nn, k) -short nn; -register short k; +short nd_tval(short nn, short k) { register short ec, n; Index: ram/etvel.c =================================================================== --- ram/etvel.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etvel.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -38,7 +38,5 @@ */ -short -et_vel(n) -short n; +short et_vel(short n) { sprintf(ebuf, "%03d", lastvel[n] / 252); @@ -58,7 +56,5 @@ */ -short -ef_vel(n) -short n; +short ef_vel(short n) { register short ival, i; @@ -107,7 +103,5 @@ */ -short -rd_vel(n) -short n; +short rd_vel(short n) { char buf[6]; @@ -133,7 +127,5 @@ */ -short -nd_vel(n, k) -register short n, k; +short nd_vel(short n, short k) { register short ec; Index: ram/etwavs.c =================================================================== --- ram/etwavs.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etwavs.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -15,5 +15,5 @@ #include "wsdsp.h" -extern short advwcur(); +extern void advwcur(void); extern unsigned *waveob; @@ -37,7 +37,5 @@ */ -short -et_wavs(n) -short n; +short et_wavs(short n) { sprintf(ebuf, "%02d", curwave + 1); @@ -53,7 +51,5 @@ */ -short -ef_wavs(n) -short n; +short ef_wavs(short n) { register short i, tmpval; @@ -85,7 +81,5 @@ */ -short -rd_wavs(nn) -short nn; +short rd_wavs(short nn) { register short n; @@ -110,8 +104,5 @@ */ -short -nd_wavs(nn, k) -short nn; -register short k; +short nd_wavs(short nn, short k) { register short ec, n; Index: ram/etwhar.c =================================================================== --- ram/etwhar.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etwhar.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -15,5 +15,7 @@ #include "wsdsp.h" -extern short advwcur(), newws(), wdswin(); +extern void advwcur(void); +extern void newws(void); +extern void wdswin(short n); extern unsigned *waveob; @@ -35,7 +37,5 @@ */ -short -et_whar(n) -short n; +short et_whar(short n) { sprintf(ebuf, "%02d", curwhrm + 1); @@ -50,7 +50,5 @@ */ -short -ef_whar(n) -short n; +short ef_whar(short n) { register short i, tmpval; @@ -83,7 +81,5 @@ */ -short -rd_whar(nn) -short nn; +short rd_whar(short nn) { register short n; @@ -105,8 +101,5 @@ */ -short -nd_whar(nn, k) -short nn; -register short k; +short nd_whar(short nn, short k) { register short ec, n; Index: ram/etwhrv.c =================================================================== --- ram/etwhrv.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etwhrv.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -17,5 +17,6 @@ #include "wsdsp.h" -extern short advwcur(), wdswin(); +extern void advwcur(void); +extern void wdswin(short n); extern unsigned *waveob; @@ -43,7 +44,5 @@ */ -short -et_whrv(n) -short n; +short et_whrv(short n) { register short harv; @@ -77,7 +76,5 @@ */ -short -ef_whrv(n) -short n; +short ef_whrv(short n) { register short *hv; @@ -123,7 +120,5 @@ */ -short -rd_whrv(nn) -short nn; +short rd_whrv(short nn) { register short harv, n; @@ -162,8 +157,5 @@ */ -short -nd_whrv(nn, k) -short nn; -register short k; +short nd_whrv(short nn, short k) { register short ec, n; Index: ram/etwoff.c =================================================================== --- ram/etwoff.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etwoff.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -18,5 +18,7 @@ #include "wsdsp.h" -extern short advwcur(), wdswin(), pntsup(); +extern void advwcur(void); +extern void wdswin(short n); +extern void pntsup(void); extern unsigned *waveob; @@ -40,7 +42,5 @@ */ -short -et_woff(n) -short n; +short et_woff(short n) { register short hoff; @@ -76,7 +76,5 @@ */ -short -ef_woff(n) -short n; +short ef_woff(short n) { register short *ov; @@ -120,7 +118,5 @@ */ -short -rd_woff(nn) -short nn; +short rd_woff(short nn) { register short hoff, n; @@ -164,8 +160,5 @@ */ -short -nd_woff(nn, k) -short nn; -register short k; +short nd_woff(short nn, short k) { register short ec, n; Index: ram/etwpnt.c =================================================================== --- ram/etwpnt.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etwpnt.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -15,5 +15,7 @@ #include "wsdsp.h" -extern short advwcur(), wdswin(), newws(); +extern void advwcur(void); +extern void wdswin(short n); +extern void newws(void); extern unsigned *waveob; @@ -35,7 +37,5 @@ */ -short -et_wpnt(n) -short n; +short et_wpnt(short n) { sprintf(ebuf, "%03d", curwpnt); @@ -55,7 +55,5 @@ */ -short -ef_wpnt(n) -short n; +short ef_wpnt(short n) { register short i, tmpval; @@ -88,7 +86,5 @@ */ -short -rd_wpnt(nn) -short nn; +short rd_wpnt(short nn) { register short n; @@ -114,8 +110,5 @@ */ -short -nd_wpnt(nn, k) -short nn; -register short k; +short nd_wpnt(short nn, short k) { register short ec, n; Index: ram/etwslt.c =================================================================== --- ram/etwslt.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etwslt.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -19,5 +19,8 @@ #include "wsdsp.h" -extern short advwcur(), wdswin(), newws(), dsnewws(); +extern void advwcur(void); +extern void wdswin(short n); +extern void newws(void); +extern void dsnewws(void); extern unsigned *waveob; @@ -39,7 +42,5 @@ */ -short -et_wslt(n) -short n; +short et_wslt(short n) { sprintf(ebuf, "%c", curwslt + 'A'); @@ -55,7 +56,5 @@ */ -short -ef_wslt(n) -short n; +short ef_wslt(short n) { ebuf[1] = '\0'; /* terminate the string in ebuf */ @@ -83,7 +82,5 @@ */ -short -rd_wslt(nn) -short nn; +short rd_wslt(short nn) { register short n; @@ -105,8 +102,5 @@ */ -short -nd_wslt(nn, k) -short nn; -register short k; +short nd_wslt(short nn, short k) { register short n; Index: ram/etwvce.c =================================================================== --- ram/etwvce.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/etwvce.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -15,5 +15,5 @@ #include "wsdsp.h" -extern short advwcur(); +extern void advwcur(void); extern unsigned *waveob; @@ -35,7 +35,5 @@ */ -short -et_wvce(n) -short n; +short et_wvce(short n) { sprintf(ebuf, "%02d", curvce + 1); @@ -51,7 +49,5 @@ */ -short -ef_wvce(n) -short n; +short ef_wvce(short n) { register short i, tmpval; @@ -82,7 +78,5 @@ */ -short -rd_wvce(nn) -short nn; +short rd_wvce(short nn) { register short n; @@ -104,8 +98,5 @@ */ -short -nd_wvce(nn, k) -short nn; -register short k; +short nd_wvce(short nn, short k) { register short ec, n; Index: ram/fcnote.c =================================================================== --- ram/fcnote.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/fcnote.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -41,7 +41,5 @@ */ -struct n_entry * -fcnote(grp, tnote) -register short grp, tnote; +struct n_entry *fcnote(short grp, short tnote) { register struct n_entry *bp, *ep; Index: ram/frfind.c =================================================================== --- ram/frfind.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/frfind.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -78,9 +78,5 @@ */ -struct s_entry * -ep_adj(sep, sdir, tval) -register struct s_entry *sep; -int sdir; -register long tval; +struct s_entry *ep_adj(struct s_entry *sep, int sdir, long tval) { register struct s_entry *tep; @@ -229,8 +225,5 @@ */ -struct s_entry * -frfind(tval, sdir) -register long tval; -int sdir; +struct s_entry *frfind(long tval, int sdir) { register int i; @@ -380,9 +373,5 @@ */ -struct s_entry * -findev(ep, te, et, d1, d2) -struct s_entry *ep; -register long te; -register short et, d1, d2; +struct s_entry *findev(struct s_entry *ep, long te, short et, short d1, short d2) { register struct s_entry *tp; @@ -424,9 +413,5 @@ */ -struct s_entry * -ehfind(eh, te, d1, d2) -register short eh; -register long te; -register short d1, d2; +struct s_entry *ehfind(short eh, long te, short d1, short d2) { register struct s_entry *tp; Index: ram/gcurpos.c =================================================================== --- ram/gcurpos.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/gcurpos.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -38,7 +38,9 @@ #define AW_F 0xFFFF -extern int objclr(), SetPri(), vbank(); - -extern unsigned exp_c(); +extern void objclr(unsigned obj); +extern void SetPri(int obj, int pri); +extern void vbank(unsigned b); + +extern unsigned exp_c(unsigned c); extern short stcrow, stccol; @@ -251,7 +253,5 @@ */ -int -gcurpos(xloc, yloc) -register int xloc, yloc; +int gcurpos(int xloc, int yloc) { register int ab, xo, yo; @@ -306,7 +306,5 @@ */ -andcopy(to, from, with, len) -register unsigned *to, *from, with; -short len; +void andcopy(unsigned *to, unsigned *from, unsigned with, short len) { register short i; @@ -322,6 +320,5 @@ */ -arcurs(icolor) -unsigned icolor; +void arcurs(unsigned icolor) { register short color; @@ -352,5 +349,5 @@ */ -sgcon() +void sgcon(void) { if (sgcsw) @@ -370,5 +367,5 @@ */ -sgcoff() +void sgcoff(void) { if (!sgcsw) Index: ram/idfield.c =================================================================== --- ram/idfield.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/idfield.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -18,24 +18,74 @@ #include "instdsp.h" -extern short select(), stdmkey(), stddkey(), nokey(), cxkstd(), cykstd(); -extern short vtoy(), ttox(), timeto(), vcputsv(), dswin(), stdctp1(); -extern short whatbox(), inspnt(), pntsel(), setseg(), showpt(); - -extern short et_null(), ef_null(), rd_null(), nd_null(); -extern short et_ipnt(), ef_ipnt(), rd_ipnt(), nd_ipnt(); -extern short et_idin(), ef_idin(), rd_idin(), nd_idin(); -extern short et_ivce(), ef_ivce(), rd_ivce(), nd_ivce(); -extern short et_icnf(), ef_icnf(), rd_icnf(), nd_icnf(); -extern short et_ival(), ef_ival(), rd_ival(), nd_ival(); -extern short et_itim(), ef_itim(), rd_itim(), nd_itim(); -extern short et_iosc(), ef_iosc(), rd_iosc(), nd_iosc(); -extern short et_iact(), ef_iact(), rd_iact(), nd_iact(); -extern short et_iwsn(), ef_iwsn(), rd_iwsn(), nd_iwsn(); -extern short et_ires(), ef_ires(), rd_ires(), nd_ires(); -extern short et_imlt(), ef_imlt(), rd_imlt(), nd_imlt(); - -extern unsigned fromfpu(); - -extern char *memset(); +extern void select(void); +extern void stdmkey(void); +extern void stddkey(void); +extern short nokey(void); +extern void cxkstd(void); +extern void cykstd(void); +extern short vtoy(short val, short window); +extern short ttox(unsigned time, short window); +extern short timeto(short fn, short pj); +extern void vcputsv(int *obase, int nw, int fg, int bg, int row, int col, char *str, int pitch); +extern void dswin(short n); +extern short stdctp1(void); +extern short whatbox(void); +extern short inspnt(struct instdef *ip, short fn, short inpnt); +extern void pntsel(void); +extern void setseg(short pn, unsigned ptime); +extern void showpt(short q); + +extern short et_null(void); +extern short ef_null(void); +extern short rd_null(void); +extern short nd_null(void); +extern short et_ipnt(short n); +extern short ef_ipnt(short n); +extern short rd_ipnt(short n); +extern short nd_ipnt(short n, short k); +extern short et_idin(short n); +extern short ef_idin(short n); +extern short rd_idin(short n); +extern short nd_idin(short n, short k); +extern short et_ivce(short n); +extern short ef_ivce(short n); +extern short rd_ivce(short n); +extern short nd_ivce(short n, short k); +extern short et_icnf(short n); +extern short ef_icnf(short n); +extern short rd_icnf(short n); +extern short nd_icnf(short n, short k); +extern short et_ival(short n); +extern short ef_ival(short n); +extern short rd_ival(short n); +extern short nd_ival(short n, short k); +extern short et_itim(short n); +extern short ef_itim(short n); +extern short rd_itim(short n); +extern short nd_itim(short n, short k); +extern short et_iosc(short nn); +extern short ef_iosc(short nn); +extern short rd_iosc(short nn); +extern short nd_iosc(short nn, short k); +extern short et_iact(short nn); +extern short ef_iact(short nn); +extern void rd_iact(short nn); +extern short nd_iact(short nn, short k); +extern short et_iwsn(short nn); +extern short ef_iwsn(short nn); +extern short rd_iwsn(short nn); +extern short nd_iwsn(short nn, short k); +extern short et_ires(short n); +extern short ef_ires(short n); +extern short rd_ires(short n); +extern short nd_ires(short n, short k); +extern short et_imlt(short n); +extern short ef_imlt(short n); +extern short rd_imlt(short n); +extern short nd_imlt(short n, short k); + +extern unsigned fromfpu(unsigned fputime); + +extern char *memset(char *sp, char c, int n); /* @@ -73,5 +123,10 @@ extern struct instdef vbufs[]; -short idx_key(), idnfld(), idcxupd(), idcyupd(), ikyup(), ikydn(); +void idx_key(void); +short idnfld(short k); +void idcxupd(void); +void idcyupd(void); +void ikyup(void); +void ikydn(void); /* @@ -165,6 +220,5 @@ */ -short -ikydn() +void ikydn(void) { imflag = FALSE; @@ -177,6 +231,5 @@ */ -short -ikyup() +void ikyup(void) { if (imflag) @@ -193,6 +246,5 @@ */ -short -idcyupd() +void idcyupd(void) { register short pval, vh, vl; @@ -263,6 +315,5 @@ */ -short -idcxupd() +void idcxupd(void) { register unsigned th, tl; @@ -384,7 +435,5 @@ */ -short -idnfld(k) -short k; +short idnfld(short k) { register short endpnt, basepnt, t, fn; @@ -486,6 +535,5 @@ */ -short -idx_key() +void idx_key(void) { register struct sment *smp; @@ -566,5 +614,5 @@ */ -idfield() +void idfield(void) { idimsw = FALSE; Index: ram/idselbx.c =================================================================== --- ram/idselbx.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/idselbx.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -17,10 +17,20 @@ extern short (*itxput)(); -extern short lseg(), dswin(), tsplot4(), vbfill4(), enterit(), vtdisp(); -extern short advicur(), bspicur(); - -extern short drawfn(), selpnt(), ttox(), vtoy(); - -extern unsigned timeto(), exp_c(); +extern void lseg(short x1, short y1, short x2, short y2, short t); +extern void dswin(short n); +extern void tsplot4(int *obase, int nw, int fg, int row, int col, char *str, int pitch); +extern void vbfill4(unsigned *obj, short obwidth, short xmin, short ymin, short xmax, short ymax, unsigned color); +extern void enterit(void); +extern void vtdisp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf); +extern void advicur(void); +extern void bspicur(void); + +extern void drawfn(short fn, short how, short pen, short wn); +extern short selpnt(void); +extern short ttox(unsigned time, short window); +extern short vtoy(short val, short window); + +extern short timeto(short fn, short pj); +extern unsigned exp_c(unsigned c); /* @@ -54,5 +64,6 @@ /* forward references */ -short bx_null(), idfnbox(); +short bx_null(void); +short idfnbox(short n); /* @@ -106,8 +117,5 @@ */ -idtxput(row, col, txt, tag) -short row, col; -char *txt; -short tag; +void idtxput(short row, short col, char *txt, short tag) { if (v_regs[5] & 0x0180) @@ -123,5 +131,5 @@ */ -showim() +void showim(void) { register short row, col, ins; @@ -155,5 +163,5 @@ */ -cdnicur() +void cdnicur(void) { register struct instdef *ip; @@ -199,5 +207,5 @@ */ -cupicur() +void cupicur(void) { register struct instdef *ip; @@ -243,7 +251,5 @@ */ -short -edfunc(n) -short n; +short edfunc(short n) { register unsigned cx; @@ -330,6 +336,5 @@ */ -showpt(q) -short q; +void showpt(short q) { register short ptx, pty, i, j, k; @@ -373,5 +378,5 @@ */ -endityp() +void endityp(void) { idnamsw = FALSE; @@ -388,5 +393,5 @@ */ -showfn() +void showfn(void) { dswin(13); /* source multiplier */ @@ -400,6 +405,5 @@ */ -short -bx_null() +short bx_null(void) { return(TRUE); @@ -412,6 +416,5 @@ */ -iclrwin(n) -register short n; +void iclrwin(short n) { if (v_regs[5] & 0x0180) @@ -432,7 +435,5 @@ */ -short -idfnbox(n) -short n; +short idfnbox(short n) { register short col, i, row; Index: ram/im700.c =================================================================== --- ram/im700.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/im700.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -44,8 +44,14 @@ #include "wsdsp.h" -extern unsigned tofpu(); - -extern short nokey(), stdmkey(), cxkstd(), cykstd(), cxgen(), cygen(); -extern short cmvgen(), stdctp2(); +extern unsigned tofpu(unsigned time); + +extern short nokey(void); +extern void stdmkey(void); +extern void cxkstd(void); +extern void cykstd(void); +extern void cxgen(void); +extern void cygen(void); +extern void cmvgen(void); +extern short stdctp2(void); extern short blakpal[16][3]; @@ -591,7 +597,5 @@ */ -short -valof(srcv) -short srcv; +short valof(short srcv) { switch (srcv) { @@ -638,5 +642,5 @@ */ -inismtb() +void inismtb(void) { register short i, oldi; @@ -683,5 +687,5 @@ */ -clrpfl() +void clrpfl(void) { register short i; @@ -706,5 +710,5 @@ */ -im700() +void im700(void) { register short i, j, k; Index: ram/infield.c =================================================================== --- ram/infield.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/infield.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -19,8 +19,5 @@ */ -short -infield(row, col, fetp) -register short row, col; -register struct fet *fetp; +short infield(short row, short col, struct fet *fetp) { infetp = (struct fet *)NULL; /* setup for NULL infetp return */ Index: ram/initi.c =================================================================== --- ram/initi.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/initi.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -17,7 +17,8 @@ #include "instdsp.h" -extern int setipl(); - -extern unsigned tofpu(), fromfpu(); +extern unsigned setipl(unsigned arg); + +extern unsigned tofpu(unsigned time); +extern unsigned fromfpu(unsigned fputime); extern short s_inst[], vce2trg[], vce2grp[]; @@ -105,8 +106,5 @@ */ -short -segtime(pn, ptime) -short pn; -unsigned ptime; +short segtime(short pn, unsigned ptime) { register struct instpnt *pp; @@ -131,7 +129,5 @@ */ -setseg(pn, ptime) -short pn; -unsigned ptime; +void setseg(short pn, unsigned ptime) { register short i; @@ -158,7 +154,5 @@ */ -short -timeto(fn, pj) -short fn, pj; +short timeto(short fn, short pj) { register struct instdef *ip; @@ -192,5 +186,5 @@ */ -pntsel() +void pntsel(void) { register struct idfnhdr *fp; @@ -240,7 +234,5 @@ */ -short -vtoy(val, window) -short val, window; +short vtoy(short val, short window) { register short yval; @@ -267,8 +259,5 @@ */ -short -ttox(time, window) -unsigned time; -short window; +short ttox(unsigned time, short window) { register short xval; @@ -314,6 +303,5 @@ */ -short -selpnt() +short selpnt(void) { register struct idfnhdr *fp; @@ -368,5 +356,5 @@ */ -setinst() +void setinst(void) { register struct instdef *ip; @@ -397,6 +385,5 @@ */ -newinst(inst) -short inst; +void newinst(short inst) { curinst = inst; @@ -411,6 +398,5 @@ */ -newvce(voice) -short voice; +void newvce(short voice) { curvce = voice; @@ -429,6 +415,5 @@ */ -setivce(voice) -short voice; +void setivce(short voice) { register short i, j, k, oldi; @@ -473,5 +458,5 @@ */ -modinst() +void modinst(void) { short f, i, grp, oldi; @@ -524,6 +509,5 @@ */ -initi(ip) -register struct instdef *ip; +void initi(struct instdef *ip) { register short i, mintfpu, rb; @@ -572,5 +556,5 @@ */ -initil() +void initil(void) { register short i; Index: ram/instdsp.c =================================================================== --- ram/instdsp.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/instdsp.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -30,12 +30,15 @@ /* things defined elsewhere */ -extern int (*point)(), fpuint(), setipl(); -extern int cnvc2p(); - -extern unsigned tofpu(), fromfpu(), exp_c(); - -extern char *dsimlt(); - -extern long rand24(); +extern void fpuint(void); +extern unsigned setipl(unsigned arg); +extern void cnvc2p(char *buf, short cv); + +extern unsigned tofpu(unsigned time); +extern unsigned fromfpu(unsigned fputime); +extern unsigned exp_c(unsigned c); + +extern char *dsimlt(char *buf, short src, short mltval); + +extern long rand24(void); /* @@ -97,5 +100,5 @@ /* forward references */ -short idpoint(); +void idpoint(short x, short y, short pen); short idbox[][8] = { /* display box parameters */ @@ -249,6 +252,5 @@ */ -drawpt(px, py, pc) -short px, py, pc; +void drawpt(short px, short py, short pc) { register short tmp; @@ -287,6 +289,5 @@ */ -drawfn(fn, how, pen, wn) -short fn, how, pen, wn; +void drawfn(short fn, short how, short pen, short wn) { struct idfnhdr *fp; @@ -410,7 +411,5 @@ */ -short -addpch(p1, p2) -short p1, p2; +short addpch(short p1, short p2) { register long pl; @@ -434,7 +433,5 @@ */ -short -irand(range) -short range; +short irand(short range) { if (range LE 0) /* limit things to 'reasonable' values */ @@ -457,7 +454,5 @@ */ -short -xgetran(mlt) -short mlt; +short xgetran(short mlt) { register short sltmp; @@ -481,6 +476,5 @@ */ -dosync(vce) -short vce; +void dosync(short vce) { register short sync; @@ -512,7 +506,5 @@ */ -oscdsp(row, val, n, lbl, frq) -short row, val, n, frq; -char *lbl; +void oscdsp(short row, short val, short n, short frq, char *lbl) { register short fh, fl; @@ -582,7 +574,5 @@ */ -pltws(ws, pen) -register unsigned ws[]; -register short pen; +void pltws(unsigned ws[], short pen) { register short i, x, y; @@ -607,6 +597,5 @@ */ -dswin(n) -register short n; +void dswin(short n) { short th, tl, vh, vl, vv, mltval, lboff; @@ -888,5 +877,5 @@ */ -allwins() +void allwins(void) { register short i; @@ -902,7 +891,5 @@ */ -short -idpoint(x, y, pen) -short x, y, pen; +void idpoint(short x, short y, short pen) { if (v_regs[5] & 0x0180) @@ -922,5 +909,5 @@ */ -idbord() +void idbord(void) { point = idpoint; @@ -964,5 +951,5 @@ */ -idvlblc() +void idvlblc(void) { vlbtype = 0; /* nothing in the message window */ @@ -977,5 +964,5 @@ */ -idvlbld() +void idvlbld(void) { vlbtype = 1; /* variable labels */ @@ -998,5 +985,5 @@ */ -idvtyp() +void idvtyp(void) { vlbtype = 2; /* virtual typewriter */ @@ -1013,5 +1000,5 @@ */ -idcpfch() +void idcpfch(void) { vlbtype = 3; /* copy / fetch menu */ @@ -1034,5 +1021,5 @@ */ -instdsp() +void instdsp(void) { register struct instdef *ip; @@ -1091,5 +1078,5 @@ */ -reshowi() +void reshowi(void) { idfield(); /* fix up field table, etc. */ Index: ram/itcpos.c =================================================================== --- ram/itcpos.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/itcpos.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -21,5 +21,5 @@ #define CW_F 0xFFFF -extern unsigned exp_c(); +extern unsigned exp_c(unsigned c); extern short stcrow, stccol; /* text cursor row,col */ @@ -61,6 +61,5 @@ */ -itcini(color) -unsigned color; +void itcini(unsigned color) { if ((v_regs[5] & 0x0180) NE 0x0100) @@ -80,6 +79,5 @@ */ -itcpos(row, col) -register short row, col; +void itcpos(short row, short col) { register short yrow, xcol; @@ -118,5 +116,5 @@ */ -advicur() +void advicur(void) { register short newcol; @@ -139,5 +137,5 @@ */ -bspicur() +void bspicur(void) { register short newcol; Index: ram/lcdlbls.c =================================================================== --- ram/lcdlbls.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/lcdlbls.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -48,8 +48,8 @@ */ -extern char gain2eq(); - -extern short nokey(); -extern short setsr(); +extern char gain2eq(short gain); + +extern short nokey(void); +extern unsigned setsr(unsigned sr); extern short (*d_key)(); @@ -125,7 +125,21 @@ /* forward references */ -short l_prmtr(), l_other(), l_voice(), l_init(), l_clock(), l_eq(); -short trapper(), setlamp(), rpctl(), quiet(); -short l_group(), l_dflt(), l_inst(), l_goto(), l_asgn(), l_adfl(), l_load(); +void l_prmtr(short stat, short sig); +void l_other(short stat, short sig); +void l_voice(short stat, short vce); +void l_init(short stat, short sig); +void l_clock(short stat); +void l_eq(short stat, short sig); +void trapper(short stat); +void setlamp(stat); +void rpctl(short stat); +void quiet(void); +void l_group(short stat, short grp); +void l_dflt(short stat); +void l_inst(short stat); +void l_goto(short stat); +void l_asgn(short stat); +void l_adfl(short stat); +void l_load(short stat); /* initialized stuff */ @@ -432,6 +446,5 @@ */ -short -quiet() +void quiet(void) { register short vce; @@ -456,7 +469,5 @@ */ -short -rpctl(stat) -short stat; +void rpctl(short stat) { if (NOT stat) @@ -477,7 +488,5 @@ */ -short -trapper(stat) -short stat; +void trapper(short stat) { if (stat) @@ -491,7 +500,5 @@ */ -short -l_clock(stat) -short stat; +void l_clock(short stat) { if (NOT stat) @@ -508,5 +515,5 @@ */ -ulamp() +void ulamp(void) { if ((sliders EQ LS_VOICE) OR (sliders EQ LS_INST)) @@ -534,5 +541,5 @@ */ -preio() +void preio(void) { short oldipl; @@ -554,5 +561,5 @@ */ -postio() +void postio(void) { short oldipl; @@ -581,6 +588,5 @@ */ -short -setlamp(stat) +void setlamp(stat) { register short oldi; @@ -615,5 +621,5 @@ */ -lcd_on() +void lcd_on(void) { register short oldi; @@ -637,6 +643,5 @@ */ -loadkey(key) -short key; +void loadkey(short key) { if (NOT astat) @@ -675,6 +680,5 @@ */ -pcancel(pm) -short pm; +void pcancel(short pm) { point = GLCplot; /* setup to plot on LCD */ @@ -725,7 +729,5 @@ */ -short -l_load(stat) -short stat; +void l_load(short stat) { if (NOT stat) @@ -805,5 +807,5 @@ */ -lcdlbls() +void lcdlbls(void) { register short i, barval; @@ -968,6 +970,5 @@ */ -selasg(n) -short n; +void selasg(short n) { register struct s_entry *ep; @@ -1022,7 +1023,5 @@ */ -short -l_adfl(stat) -short stat; +void l_adfl(short stat) { if (NOT stat) @@ -1042,7 +1041,5 @@ */ -short -l_asgn(stat) -short stat; +void l_asgn(short stat) { if (NOT stat) /* only do this on key closure */ @@ -1117,7 +1114,5 @@ */ -short -l_inst(stat) -short stat; +void l_inst(short stat) { if (NOT stat) @@ -1196,6 +1191,5 @@ */ -selins(ival) -register short ival; +void selins(short ival) { register short n; @@ -1259,7 +1253,5 @@ */ -short -l_dflt(stat) -short stat; +void l_dflt(short stat) { if (NOT stat) @@ -1279,7 +1271,5 @@ */ -short -l_goto(stat) -short stat; +void l_goto(short stat) { if (NOT stat) /* only do this on key closure */ @@ -1355,8 +1345,5 @@ */ -newpps(trg, grp, src, ival) -register short trg; -short grp, src; -register short ival; +void newpps(short trg, short grp, short src, short ival) { register struct sment *smf, *smp; @@ -1432,8 +1419,5 @@ */ -short -newsv(grp, src, ival) -short grp, src; -register short ival; +short newsv(short grp, short src, short ival) { register struct sment *smf, *smp; @@ -1526,7 +1510,5 @@ */ -setsv(grp, src, ival) -short grp, src; -register short ival; +void setsv(short grp, short src, short ival) { register struct sment *smf, *smp; @@ -1600,7 +1582,5 @@ */ -short -l_prmtr(stat, sig) -short stat, sig; +void l_prmtr(short stat, short sig) { if (NOT stat) @@ -1639,7 +1619,5 @@ */ -short -l_voice(stat, vce) -short stat, vce; +void l_voice(short stat, short vce) { register short ap, j, par; @@ -1687,7 +1665,5 @@ */ -short -l_group(stat, grp) -short stat, grp; +void l_group(short stat, short grp) { char buf[8]; @@ -1712,7 +1688,5 @@ */ -short -l_other(stat, sig) -short stat, sig; +void l_other(short stat, short sig) { if (NOT stat) @@ -1735,7 +1709,5 @@ */ -short -l_eq(stat, sig) -short stat, sig; +void l_eq(short stat, short sig) { if (NOT stat) @@ -1762,5 +1734,5 @@ */ -artclr() +void artclr(void) { register short i; @@ -1780,7 +1752,5 @@ */ -short -l_init(stat, sig) -short stat, sig; +void l_init(short stat, short sig) { register unsigned *fpu; @@ -1862,6 +1832,5 @@ */ -sendart(vce, par, ival) -short vce, par, ival; +void sendart(short vce, short par, short ival) { register unsigned *fpu; @@ -1934,5 +1903,5 @@ */ -doslide() +void doslide(void) { register short arp, bar, barval, i, slval; @@ -2046,6 +2015,5 @@ */ -settmpo(val) -short val; +void settmpo(short val) { register short timeval; @@ -2068,5 +2036,5 @@ */ -settune() +void settune(void) { register short oldi, i, grp; Index: ram/ldfield.c =================================================================== --- ram/ldfield.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ldfield.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -23,12 +23,31 @@ #include "score.h" -extern short select(), whatbox(), nokey(), cxkstd(), cykstd(), stdmkey(); -extern short et_null(), ef_null(), rd_null(), nd_null(), lmwclr(); -extern short vcputsv(), ftkind(), _clsvol(), lcancel(), stdctp0(); -extern short ldline(), lin2slt(), dslslot(), putcat(), showcat(), showsiz(); - -extern unsigned exp_c(); - -extern char *memset(), *slotnam(); +extern void select(void); +extern short whatbox(void); +extern short nokey(void); +extern void cxkstd(void); +extern void cykstd(void); +extern void stdmkey(void); +extern short et_null(void); +extern short ef_null(void); +extern short rd_null(void); +extern short nd_null(void); +extern void lmwclr(void); +extern void vcputsv(int *obase, int nw, int fg, int bg, int row, int col, char *str, int pitch); +extern short ftkind(short ns); +extern void _clsvol(void); +extern short lcancel(short lct); +extern short stdctp0(void); +extern short ldline(short cy); +extern short lin2slt(short line); +extern void dslslot(short slot, unsigned fg, short row); +extern short putcat(void); +extern short showcat(void); +extern int showsiz(void); + +extern unsigned exp_c(unsigned c); + +extern char *memset(char *sp, char c, int n); +extern char *slotnam(unsigned slot, unsigned kind); /* @@ -90,5 +109,10 @@ /* forward reference */ -short ld_prmv(), ldxkey(), ldmkey(), ldkey(), ldcxupd(), ldcyupd(); +void ld_prmv(void); +short ldxkey(void); +void ldmkey(void); +short ldkey(short k); +void ldcxupd(void); +void ldcyupd(void); /* @@ -173,6 +197,5 @@ */ -short -ldxkey() +short ldxkey(void) { register char *fn; @@ -326,6 +349,5 @@ */ -short -ld_prmv() +void ld_prmv(void) { if (lderrsw) /* clear any error messages in the window */ @@ -350,6 +372,5 @@ */ -short -ldcyupd() +void ldcyupd(void) { if (lmwtype EQ 1) { @@ -378,6 +399,5 @@ */ -short -ldcxupd() +void ldcxupd(void) { if (lmwtype EQ 1 ) { @@ -406,6 +426,5 @@ */ -short -ldmkey() +void ldmkey(void) { if (astat) { @@ -436,6 +455,5 @@ */ -loadem(key) -short key; +void loadem(short key) { register short c, i, rc, slot; @@ -483,7 +501,5 @@ */ -short -ldkey(k) -short k; +short ldkey(short k) { register short c, col, row, slot; @@ -543,5 +559,5 @@ */ -ldfield() +void ldfield(void) { lmwtype = 0; Index: ram/ldselbx.c =================================================================== --- ram/ldselbx.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ldselbx.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -28,13 +28,33 @@ #include "scfns.h" -extern short ldswin(), advlcur(), bsplcur(), ttcpos(), fcindex(), storit(); -extern short showsiz(), get_asg(), get_orc(), get_tun(), get_wav(), nokey(); -extern short ldline(), lin2slt(), dslslot(), vtdisp(), ldpoint(), rd_ec(); -extern short fcreset(), ftkind(), ldwmsg(), ldbusy(), ckstor(); -extern short get_pat(), get_scr(); - -extern unsigned exp_c(); - -extern char *slotnam(); +extern void ldswin(short n); +extern void advlcur(void); +extern void bsplcur(void); +extern void ttcpos(short row, short col); +extern short fcindex(void); +extern short storit(void); +extern int showsiz(void); +extern short get_asg(void); +extern short get_orc(short lorh, short kind); +extern short get_tun(void); +extern short get_wav(void); +extern short nokey(void); +extern short ldline(short cy); +extern short lin2slt(short line); +extern void dslslot(short slot, unsigned fg, short row); +extern void vtdisp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf); +extern void ldpoint(short x, short y, short pen); +extern short rd_ec(FILE *fp, char *to, long len); +extern void fcreset(void); +extern short ftkind(short ns); +extern void ldwmsg(char *line1, char *line2, char *line3, unsigned fgcolor, unsigned bgcolor); +extern void ldbusy(char *msg); +extern short ckstor(void); +extern short get_pat(void); +extern short get_scr(void); + +extern unsigned exp_c(unsigned c); + +extern char *slotnam(unsigned slot, unsigned kind); /* @@ -114,5 +134,6 @@ /* forward references */ -short bx_null(), ldfnbox(); +short bx_null(void); +short ldfnbox(short n); /* @@ -160,6 +181,5 @@ */ -skperr(sn) -short sn; +void skperr(short sn) { char scid[32]; @@ -185,8 +205,5 @@ */ -short -skp_ec(fp, len) -register FILE *fp; -register long len; +short skp_ec(FILE *fp, long len) { register long count; @@ -229,8 +246,5 @@ */ -short -scskip(fp, ns) -register FILE *fp; -short ns; +short scskip(FILE *fp, short ns) { register short ehdr, go; @@ -305,7 +319,5 @@ */ -ldermsg(p1, p2, p3, p4, p5) -char *p1, *p2, *p3; -unsigned p4, p5; +void ldermsg(char *p1, char *p2, char *p3, unsigned p4, unsigned p5) { char msgbuf[64]; @@ -328,5 +340,5 @@ */ -clrerms() +void clrerms(void) { if (lderrsw) { @@ -348,5 +360,5 @@ */ -clrlsel() +void clrlsel(void) { if (lselsw) { @@ -378,5 +390,5 @@ */ -endltyp() +void endltyp(void) { lmwclr(); @@ -394,6 +406,5 @@ */ -savefc(kind) -short kind; +void savefc(short kind) { short fi; @@ -418,7 +429,5 @@ */ -short -lcancel(lct) -short lct; +short lcancel(short lct) { short rc; @@ -458,7 +467,5 @@ */ -dpy_scr(color, ns) -unsigned color; -short ns; +void dpy_scr(unsigned color, short ns) { char buf[40]; @@ -496,5 +503,5 @@ */ -lst_scr() +void lst_scr(void) { register short i; @@ -540,7 +547,5 @@ */ -short -ndx_scr(slot) -register short slot; +short ndx_scr(short slot) { register FILE *fp; @@ -735,6 +740,5 @@ */ -short -getit() +short getit(void) { ldkind = ftkind(ldslot); @@ -848,7 +852,5 @@ */ -short -ldfnbox(n) -short n; +short ldfnbox(short n) { register short col, i, slot, sn; Index: ram/libdsp.c =================================================================== --- ram/libdsp.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/libdsp.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -45,9 +45,9 @@ #endif -extern short lcancel(); - -extern long ptsizer(); -extern long scsizer(); -extern long sqsizer(); +extern short lcancel(short lct); + +extern long ptsizer(void); +extern long scsizer(void); +extern long sqsizer(void); /* @@ -57,6 +57,10 @@ /* things defined elsewhere */ -extern short vbfill4(), tsplot4(), (*point)(), lseg(); -extern short clrlsel(), _clsvol(), setgc(); +extern void vbfill4(unsigned *obj, short obwidth, short xmin, short ymin, short xmax, short ymax, unsigned color); +extern void tsplot4(int *obase, int nw, int fg, int row, int col, char *str, int pitch); +extern void lseg(short x1, short y1, short x2, short y2, short t); +extern void clrlsel(void); +extern void _clsvol(void); +extern void setgc(short xv, short yv); extern int errno; @@ -135,5 +139,5 @@ /* forward references */ -short ldpoint(); +void ldpoint(short x, short y, short pen); /* @@ -190,7 +194,5 @@ */ -short -ftkind(ns) -short ns; +short ftkind(short ns) { register short i; @@ -212,7 +214,5 @@ */ -char * -fctstr(ns, just) -short ns, just; +char *fctstr(short ns, short just) { static char fcbad[11]; @@ -237,7 +237,5 @@ */ -short -ocslot(slot) -short slot; +short ocslot(short slot) { if (memcmp(filecat[slot].fcsize, "000", 3) @@ -254,7 +252,5 @@ */ -short -ldline(cy) -short cy; +short ldline(short cy) { if (cy > 292) @@ -279,7 +275,5 @@ */ -short -lin2slt(line) -short line; +short lin2slt(short line) { register short slot, row; @@ -301,7 +295,5 @@ */ -unsigned -exp_c(cx) -register unsigned cx; +unsigned exp_c(unsigned c) { cx &= 0x000F; /* use low 4 bits as the basis */ @@ -322,7 +314,5 @@ */ -ldwmsg(line1, line2, line3, fgcolor, bgcolor) -char *line1, *line2, *line3; -unsigned fgcolor, bgcolor; +void ldwmsg(char *line1, char *line2, char *line3, unsigned fgcolor, unsigned bgcolor) { lderrsw = FALSE; /* clear error switch */ @@ -367,8 +357,5 @@ */ -long -chksum(area, len) -register char *area; -register long len; +long chksum(char *area, long len) { register long cs, i; @@ -388,6 +375,5 @@ */ -makelh(kind) -short kind; +void makelh(short kind) { memset(ldhead.l_csum, '?', 8); /* checksum */ @@ -409,6 +395,5 @@ */ -ldbusy(msg) -char *msg; +void ldbusy(char *msg) { if (ndisp NE 0) @@ -425,5 +410,5 @@ */ -noslot(fctype) +void noslot(fctype) { sprintf(ldmsg1, " the %s file,", ftypes[fctype - 1][2]); @@ -443,9 +428,5 @@ */ -short -wr_ec(fp, from, len) -register FILE *fp; -register char *from; -register long len; +short wr_ec(FILE *fp, char *from, long len) { register long count; @@ -487,9 +468,5 @@ */ -short -rd_ec(fp, to, len) -register FILE *fp; -register char *to; -register long len; +short rd_ec(FILE *fp, char *to, long len) { register long count; @@ -537,7 +514,5 @@ */ -short -srchcat(extn) -char extn[]; +short srchcat(char extn[]) { register short fcslot; @@ -560,5 +535,5 @@ */ -clrcat() +void clrcat(void) { register short i; @@ -587,7 +562,5 @@ */ -short -clreq(bytes) -long bytes; +short clreq(long bytes) { register short rclusts; @@ -612,7 +585,5 @@ */ -short -spacerq(kind) -short kind; +short spacerq(short kind) { register short howmuch; @@ -683,6 +654,5 @@ */ -short -ckstor() +short ckstor(void) { if (lasgsw) /* assignments */ @@ -723,6 +693,5 @@ */ -short -ckdups() +short ckdups(void) { if (lasgsw) @@ -776,5 +745,5 @@ */ -showsiz() +int showsiz(void) { register short dcap, drem, dused; @@ -813,7 +782,5 @@ */ -short -getcat(msgsw) -short msgsw; +short getcat(short msgsw) { register FILE *fp; @@ -895,6 +862,5 @@ */ -short -putcat() +short putcat(void) { register FILE *fp; @@ -969,8 +935,5 @@ */ -dslslot(slot, fg, row) -register short slot; -unsigned fg; -short row; +void dslslot(short slot, unsigned fg, short row) { register unsigned color, chilon, chilorc; @@ -1026,6 +989,5 @@ */ -short -showcat() +short showcat(void) { register short i, fcslot, fcrow, fcount; @@ -1073,6 +1035,5 @@ */ -short -fcindex() +short fcindex(void) { if (NOT lderrsw) @@ -1103,5 +1064,5 @@ */ -streset() +void streset(void) { lstrsw = FALSE; @@ -1125,5 +1086,5 @@ */ -fcreset() +void fcreset(void) { lselsw = FALSE; @@ -1144,6 +1105,5 @@ */ -short -getslot() +short getslot(void) { register short i; @@ -1162,7 +1122,5 @@ */ -char * -slotnam(slot, kind) -unsigned slot, kind; +char *slotnam(unsigned slot, unsigned kind) { static char thename[13]; @@ -1184,7 +1142,5 @@ */ -short -wrtfile(kind) -short kind; +short wrtfile(short kind) { register short slot, flspace, tkind; @@ -1313,6 +1269,5 @@ */ -short -writem() +short writem(void) { if (lasgsw) /* Assignments */ @@ -1361,6 +1316,5 @@ */ -short -storit() +short storit(void) { register int weneed, i, slotnd, slothv; @@ -1532,5 +1486,5 @@ */ -advlcur() +void advlcur(void) { register short newcol; @@ -1556,5 +1510,5 @@ */ -bsplcur() +void bsplcur(void) { register short newcol; @@ -1584,6 +1538,5 @@ */ -ldswin(n) -register short n; +void ldswin(short n) { register short cx, cy; @@ -1737,5 +1690,5 @@ */ -lwins() +void lwins(void) { register short i; @@ -1751,7 +1704,5 @@ */ -short -ldpoint(x, y, pen) -short x, y, pen; +void ldpoint(short x, short y, short pen) { if (v_regs[5] & 0x0180) @@ -1771,5 +1722,5 @@ */ -ldbord() +void ldbord(void) { point = ldpoint; @@ -1800,5 +1751,5 @@ */ -lmwclr() +void lmwclr(void) { lmwtype = 0; @@ -1816,5 +1767,5 @@ */ -lmwvtyp() +void lmwvtyp(void) { lmwtype = 1; @@ -1836,5 +1787,5 @@ */ -libdsp() +void libdsp(void) { librob = &v_score[0]; /* setup display object pointer */ Index: ram/librw.c =================================================================== --- ram/librw.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/librw.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -42,7 +42,7 @@ #endif -extern char *slotnam(); - -extern long chksum(); +extern char *slotnam(unsigned slot, unsigned kind); + +extern long chksum(char *area, long len); extern short ldslot, lderrsw, lrasw; @@ -71,7 +71,5 @@ */ -short -wrt_asg(slot) -short slot; +short wrt_asg(short slot) { register FILE *fp; @@ -140,6 +138,5 @@ */ -short -get_asg() +short get_asg(void) { register FILE *fp; @@ -206,7 +203,5 @@ */ -short -wrt_orc(slot, lorh) -short slot, lorh; +short wrt_orc(short slot, short lorh) { register FILE *fp; @@ -301,7 +296,5 @@ */ -short -get_orc(lorh, kind) -short lorh, kind; +short get_orc(short lorh, short kind) { register FILE *fp; @@ -393,7 +386,5 @@ */ -short -wrt_tun(slot) -short slot; +short wrt_tun(short slot) { register FILE *fp; @@ -471,6 +462,5 @@ */ -short -get_tun() +short get_tun(void) { register FILE *fp; @@ -543,7 +533,5 @@ */ -short -wrt_pat(slot) -short slot; +short wrt_pat(short slot) { register FILE *fp; @@ -605,6 +593,5 @@ */ -short -get_pat() +short get_pat(void) { register FILE *fp; @@ -669,7 +656,5 @@ */ -short -wrt_scr(slot) -short slot; +short wrt_scr(short slot) { register FILE *fp; @@ -744,6 +729,5 @@ */ -short -get_scr() +short get_scr(void) { register FILE *fp; @@ -828,7 +812,5 @@ */ -short -wrt_seq(slot) -short slot; +short wrt_seq(short slot) { register FILE *fp; @@ -890,6 +872,5 @@ */ -short -get_seq() +short get_seq(void) { register FILE *fp; @@ -953,7 +934,5 @@ */ -short -wrt_wav(slot) -short slot; +short wrt_wav(short slot) { register FILE *fp; @@ -1036,6 +1015,5 @@ */ -short -get_wav() +short get_wav(void) { register FILE *fp; Index: ram/localkb.c =================================================================== --- ram/localkb.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/localkb.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -137,5 +137,5 @@ */ -setleds() +void setleds(void) { register short i; @@ -209,6 +209,5 @@ */ -localkb(sig) -short sig; +void localkb(short sig) { register short i, trg, lclkey, key, vel; Index: ram/m7menu.c =================================================================== --- ram/m7menu.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/m7menu.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -42,8 +42,13 @@ extern short (*point)(); -extern short nokey(), select(), cxkstd(), cykstd(); -extern short cxgen(), cygen(), stdctp2(); - -extern unsigned exp_c(); +extern short nokey(void); +extern void select(void); +extern void cxkstd(void); +extern void cykstd(void); +extern void cxgen(void); +extern void cygen(void); +extern short stdctp2(void); + +extern unsigned exp_c(unsigned c); extern short ndisp, runit, curslim, sgcsw, cxval, cyval, stcrow, stccol; @@ -56,5 +61,5 @@ static char ml01[61], ml02[61], ml03[61], ml04[61], ml05[61]; -short mdselbx(); +short mdselbx(short n); /* @@ -269,5 +274,5 @@ */ -dswap() +void dswap(void) { register short i; @@ -298,6 +303,5 @@ */ -mlbld(where, from) -char *where, *from; +void mlbld(char *where, char *from) { register short i, j; @@ -321,6 +325,5 @@ */ -mlpoint(x, y, pen) -short x, y, pen; +void mlpoint(short x, short y, short pen) { if (v_regs[5] & 0x0180) @@ -340,7 +343,5 @@ */ -short -mdselbx(n) -short n; +short mdselbx(short n) { register unsigned mlcv, mbcv, mbak; @@ -465,5 +466,5 @@ */ -drawm() +void drawm(void) { register short *mlp; @@ -592,5 +593,5 @@ */ -m7menu() +void m7menu(void) { menuob = &v_score[0]; Index: ram/midas.c =================================================================== --- ram/midas.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/midas.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -26,5 +26,7 @@ #endif -extern short fpuint(), clk_ped(), pch_ped(); +extern void fpuint(void); +extern void clk_ped(short stat); +extern void pch_ped(short stat); extern short (*foot1)(), (*foot2)(), (*pulse1)(), (*pulse2)(); @@ -58,5 +60,5 @@ */ -dopls1() +void dopls1(void) { putwq(&ptefifo, 0x1180); /* pulse 1 trigger -> STM fifo */ @@ -98,5 +100,5 @@ */ -dopls2() +void dopls2(void) { putwq(&ptefifo, 0x1181); /* pulse 2 trigger -> STM fifo */ @@ -113,5 +115,5 @@ */ -mpcupd() +void mpcupd(void) { switch (ndisp) { @@ -180,5 +182,5 @@ */ -main() +void main(void) { setipl(FPU_DI); /* disable FPU interrupts */ Index: ram/msl.c =================================================================== --- ram/msl.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/msl.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -157,6 +157,5 @@ */ -clk_ped(stat) -short stat; +void clk_ped(short stat) { if (stat) @@ -170,6 +169,5 @@ */ -pch_ped(stat) -short stat; +void pch_ped(short stat) { if (stat AND pchsw) @@ -187,5 +185,5 @@ */ -msl() +void msl(void) { register char *ioadr; Index: ram/msm.c =================================================================== --- ram/msm.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/msm.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -96,5 +96,5 @@ */ -msm() +void msm(void) { register short miport; Index: ram/nedacc.c =================================================================== --- ram/nedacc.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/nedacc.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -45,7 +45,7 @@ */ -extern short pix2mid(); - -extern struct n_entry *fcnote(); +extern short pix2mid(void); + +extern struct n_entry *fcnote(short grp, short tnote); extern short cflag; /* accidental flag */ @@ -71,6 +71,5 @@ */ -short -accnote() +short accnote(void) { register short rc; @@ -114,7 +113,5 @@ */ -short -ned_acc(grp) -short grp; +short ned_acc(short grp) { register short nn; @@ -163,7 +160,5 @@ */ -short -ned_nat(grp) -short grp; +short ned_nat(short grp) { register struct n_entry *ep; @@ -211,7 +206,5 @@ */ -short -nedesub(grp, note) -register short grp, note; +short nedesub(short grp, short note) { register struct s_entry *ep; @@ -343,7 +336,5 @@ */ -short -ned_end(grp) -short grp; +short ned_end(short grp) { register short rc; @@ -433,7 +424,5 @@ */ -short -ned_mvn(grp) -short grp; +short ned_mvn(short grp) { register struct n_entry *bp, *ep; @@ -535,7 +524,5 @@ */ -short -ned_mvb(grp) -short grp; +short ned_mvb(short grp) { register struct n_entry *bp, *ep; @@ -623,7 +610,5 @@ */ -short -ned_mve(grp) -short grp; +short ned_mve(short grp) { register struct n_entry *bp, *ep; @@ -709,5 +694,5 @@ */ -donote() +void donote(void) { register short grp, i, gs; Index: ram/pix2mid.c =================================================================== --- ram/pix2mid.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/pix2mid.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -122,6 +122,5 @@ */ -short -pix2mid() +short pix2mid(void) { register short i, cy, mpc; Index: ram/ptdisp.c =================================================================== --- ram/ptdisp.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ptdisp.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -15,9 +15,10 @@ #include "ptdisp.h" -extern short LineBak(), LineFwd(); +extern char *LineBak(void); +extern char *LineFwd(void); extern short (*BakLine)(), (*FwdLine)(); -extern unsigned short pt_alc(); +extern unsigned short pt_alc(void); extern unsigned short *obj8, *obj9, *obj10, *obj11; @@ -89,6 +90,5 @@ */ -ptwin(n) -short n; +void ptwin(short n) { register short i, j; @@ -253,5 +253,5 @@ */ -ptwins() +void ptwins(void) { register short i; @@ -267,5 +267,5 @@ */ -ptdisp() +void ptdisp(void) { dswap(); /* clear the video display */ Index: ram/ptdkey.c =================================================================== --- ram/ptdkey.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ptdkey.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -98,6 +98,5 @@ */ -SnapPTV(s) -char *s; +void SnapPTV(char *s) { register unsigned short stim; @@ -184,5 +183,5 @@ */ -buf2pte() +void buf2pte(void) { ptebuf.defnum = ptedef; @@ -217,5 +216,5 @@ */ -voidpb() +void voidpb(void) { memset(ptdebuf, ' ', 50); /* clear data entry buffer */ @@ -265,5 +264,5 @@ */ -setptcv() +void setptcv(void) { register unsigned short spec; @@ -357,5 +356,5 @@ */ -pte2buf() +void pte2buf(void) { register unsigned short spec; @@ -425,6 +424,5 @@ */ -ptde_ds(n, key) -register short n, key; +void ptde_ds(short n, short key) { register short chan, port, stim; @@ -561,5 +559,5 @@ */ -ptdkey() +void ptdkey(void) { register short key, val, vg; Index: ram/ptfield.c =================================================================== --- ram/ptfield.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ptfield.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -38,11 +38,18 @@ extern short (*curtype)(); -extern unsigned short fromfpu(); - -extern short select(), nokey(), stdctp5(); -extern short cxkstd(), cykstd(), stdmkey(), stddkey(); -extern short stopcm(), smxupd(), smyupd(); -extern short aftercm(); -extern short ptdkey(); +extern unsigned fromfpu(unsigned fputime); + +extern void select(void); +extern short nokey(void); +extern short stdctp5(void); +extern void cxkstd(void); +extern void cykstd(void); +extern void stdmkey(void); +extern void stddkey(void); +extern void stopcm(void); +extern void smxupd(void); +extern void smyupd(void); +extern void aftercm(void); +extern void ptdkey(void); extern short astat; @@ -79,7 +86,7 @@ extern struct patch ptebuf; -short ptxkey(); /* forward reference */ -short ptmkey(); /* forward reference */ -short ptekey(); /* forward reference */ +void ptxkey(void); +void ptmkey(void); +void ptekey(void); /* @@ -145,6 +152,5 @@ */ -short -ptmkey() +void ptmkey(void) { register short nc; @@ -202,6 +208,5 @@ */ -short -ptekey() +void ptekey(void) { register short nc; @@ -259,6 +264,5 @@ */ -short -ptxkey() +void ptxkey(void) { register short i, cp, pp, sp, stm; @@ -419,7 +423,5 @@ */ -dspdfst(buf, val) -char *buf; -register unsigned short val; +void dspdfst(char *buf, unsigned short val) { register unsigned short chan, port, stim; @@ -499,7 +501,5 @@ */ -char * -dfpdat(pp) -register struct patch *pp; +char *dfpdat(struct patch *pp) { static char buf[32]; @@ -599,9 +599,5 @@ */ -pafpu1(bf, ad, gt, gn, pp) -char *bf; -char *ad; -unsigned short gt, gn; -register struct patch *pp; +void pafpu1(char *bf, char *ad, unsigned short gt, unsigned short gn, struct patch *pp) { sprintf(bf, "%s %s %c%c %s", ad, stdata[pp->padat1], gt, gn, dfpdat(pp)); @@ -616,9 +612,5 @@ */ -pafpu2(bf, ad, os, gt, gn, pp) -char *bf; -char *ad; -unsigned short os, gt, gn; -register struct patch *pp; +void pafpu2(char *bf, char *ad, unsigned short os, unsigned short gt, unsigned short gn, struct patch *pp) { sprintf(bf, "%s %d %s %c%c %s", ad, os, stdata[pp->padat1], gt, gn, dfpdat(pp)); @@ -633,8 +625,5 @@ */ -pafpu3(bf, ad, pp) -char *bf; -char *ad; -register struct patch *pp; +void pafpu3(char *bf, char *ad, struct patch *pp) { sprintf(bf, "%s %s %s", ad, stdata[pp->padat1], dfpdat(pp)); @@ -651,7 +640,5 @@ */ -dspdest(buf, pp) -char *buf; -register struct patch *pp; +void dspdest(char *buf, struct patch *pp) { unsigned short chan, osc, port, stim, vg, vgt, vgn, vp1, vp2, sgn; @@ -968,5 +955,5 @@ */ -ptfield() +void ptfield(void) { curset(&pt_flds); Index: ram/ptread.c =================================================================== --- ram/ptread.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ptread.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -50,6 +50,5 @@ */ -short -stashp() +short stashp(void) { register short c; @@ -218,5 +217,5 @@ */ -ptioerr() +void ptioerr(void) { char erms[40]; @@ -236,5 +235,5 @@ */ -nopatch() +void nopatch(void) { clrlsel(); @@ -254,7 +253,5 @@ */ -short -ptread(fp) -register FILE *fp; +short ptread(FILE *fp) { register short go; Index: ram/ptselbx.c =================================================================== --- ram/ptselbx.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ptselbx.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -43,7 +43,10 @@ */ -extern short enterit(), nokey(), cnvp2c(), dec2fr(); - -extern unsigned short exp_c(); +extern void enterit(void); +extern short nokey(void); +extern short cnvp2c(void); +extern short dec2fr(char *s); + +extern unsigned exp_c(unsigned c); extern short CurLine; @@ -73,5 +76,5 @@ extern char *trdata[]; -short ptfnbox(); +short ptfnbox(short n); /* @@ -307,6 +310,5 @@ */ -hilitpm(n) -register char n; +void hilitpm(char n) { register short chr, h, v, w; @@ -338,5 +340,5 @@ */ -aftercm() +void aftercm(void) { switch (stccol) { /* switch based on current cursor column */ @@ -468,6 +470,5 @@ */ -movectc(r, c) -short r, c; +void movectc(short r, short c) { ctcpos(r, c); @@ -481,6 +482,5 @@ */ -endpsm(row, col) -short row, col; +void endpsm(short row, short col) { submenu = FALSE; @@ -505,6 +505,5 @@ */ -edefstm(du, n) -short du, n; +void edefstm(short du, short n) { short chan, port, stim; @@ -665,6 +664,5 @@ */ -ptdest(du) -short du; +void ptdest(short du) { register long ltemp; @@ -861,5 +859,5 @@ */ -epatch() +void epatch(void) { #if DEBUGIT @@ -897,5 +895,5 @@ */ -badpdat() +void badpdat(void) { ptedtok = FALSE; @@ -909,6 +907,5 @@ */ -setsubm(r, c) -short r, c; +void setsubm(short r, short c) { submenu = TRUE; @@ -927,7 +924,5 @@ */ -short -ptfnbox(n) -short n; +short ptfnbox(short n) { register short i, box, ptd, ptt; Index: ram/ptwrite.c =================================================================== --- ram/ptwrite.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ptwrite.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -31,5 +31,5 @@ #endif -extern long chksum(); +extern long chksum(char *area, long len); /* @@ -78,6 +78,5 @@ */ -long -ptsizer() +long ptsizer(void) { register short pp; @@ -116,7 +115,5 @@ */ -short -ptwrite(fp) -register FILE *fp; +short ptwrite(FILE *fp) { register short pp; Index: ram/puteq.c =================================================================== --- ram/puteq.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/puteq.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -74,6 +74,5 @@ */ -puteq(byte) -register char byte; +void puteq(char byte) { register short i; @@ -124,6 +123,5 @@ */ -sendeq(band, gain) -char band, gain; +void sendeq(char band, char gain) { puteq(band); @@ -131,7 +129,5 @@ } -char -gain2eq(gain) -short gain; +char gain2eq(short gain) { register char eqdat; Index: ram/rscript.c =================================================================== --- ram/rscript.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/rscript.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -6,5 +6,5 @@ */ -extern int sqscan(); +extern int sqscan(char *ip); extern int endflg; @@ -26,7 +26,5 @@ */ -short -rscript(p) -register char *p[]; +short rscript(char *p[]) { short rc; Index: ram/scadv.c =================================================================== --- ram/scadv.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/scadv.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -77,5 +77,5 @@ */ -sc_adv() +void sc_adv(void) { register short masksl, maskpx, i; @@ -270,5 +270,5 @@ */ -scupd() +void scupd(void) { register short masksl, maskpx, i; Index: ram/scfield.c =================================================================== --- ram/scfield.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/scfield.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -24,33 +24,92 @@ /* functions defined elsewhere */ -extern char *memset(); - -extern short cxkstd(), cykstd(), select(), oktode(), stdctp3(); -extern short enterit(), stddkey(), nokey(), stdmkey(); - -extern short et_strn(), ef_strn(), rd_strn(), nd_strn(); -extern short et_snbt(), ef_snbt(), rd_snbt(), nd_snbt(); - -extern short et_ioas(), ef_ioas(), rd_ioas(), nd_ioas(); -extern short et_tune(), ef_tune(), rd_tune(), nd_tune(); -extern short et_tmpo(), ef_tmpo(), rd_tmpo(), nd_tmpo(); -extern short et_intp(), ef_intp(), rd_intp(), nd_intp(); - -extern short et_inst(), ef_inst(), rd_inst(), nd_inst(); -extern short et_trns(), ef_trns(), rd_trns(), nd_trns(); -extern short et_dyn(), ef_dyn(), rd_dyn(), nd_dyn(); -extern short et_loc(), ef_loc(), rd_loc(), nd_loc(); -extern short et_vel(), ef_vel(), rd_vel(), nd_vel(); - -extern short et_res1(), ef_res1(), rd_res1(), nd_res1(); -extern short et_aval(), ef_aval(), rd_aval(), nd_aval(); -extern short et_agrp(), ef_agrp(), rd_agrp(), nd_agrp(); - -extern short et_scor(), ef_scor(), rd_scor(), nd_scor(); +extern char *memset(char *sp, char c, int n); + +extern void cxkstd(void); +extern void cykstd(void); +extern void select(void); +extern short oktode(struct s_entry *ep); +extern short stdctp3(void); +extern void enterit(void); +extern void stddkey(void); +extern short nokey(void); +extern void stdmkey(void); + +extern short et_strn(void); +extern short ef_strn(void); +extern short rd_strn(void); +extern short nd_strn(short n, short k); +extern short et_snbt(short n); +extern short ef_snbt(short n); +extern short rd_snbt(short n); +extern short nd_snbt(short n, short k); + +extern short et_ioas(short n); +extern short ef_ioas(short n); +extern short rd_ioas(short n); +extern short nd_ioas(short n, short k); +extern short et_tune(short n); +extern short ef_tune(short n); +extern short rd_tune(short n); +extern short nd_tune(short n, short k); +extern short et_tmpo(short n); +extern short ef_tmpo(short n); +extern short rd_tmpo(short n); +extern short nd_tmpo(short n, short k); +extern short et_intp(short n); +extern short ef_intp(short n); +extern short rd_intp(short n); +extern short nd_intp(short n, short k); + +extern short et_inst(short n); +extern short ef_inst(short n); +extern short rd_inst(short n); +extern short nd_inst(short n, short k); +extern short et_trns(short n); +extern short ef_trns(short n); +extern short rd_trns(short n); +extern short nd_trns(short n, short k); +extern short et_dyn(short n); +extern short ef_dyn(short n); +extern short rd_dyn(short n); +extern short nd_dyn(short n, short k); +extern short et_loc(short n); +extern short ef_loc(short n); +extern short rd_loc(short n); +extern short nd_loc(short n, short k); +extern short et_vel(short n); +extern short ef_vel(short n); +extern short rd_vel(short n); +extern short nd_vel(short n, short k); + +extern short et_res1(short n); +extern short ef_res1(short n); +extern short rd_res1(short n); +extern short nd_res1(short n, short k); +extern short et_aval(short n); +extern short ef_aval(short n); +extern short rd_aval(short n); +extern short nd_aval(short n, short k); +extern short et_agrp(short n); +extern short ef_agrp(short n); +extern short rd_agrp(short n); +extern short nd_agrp(short n, short k); + +extern short et_scor(void); +extern short ef_scor(void); +extern short rd_scor(void); +extern short nd_scor(short n, short k); /* forward references */ -short et_null(), ef_null(), rd_null(), nd_null(); -short sdcxu(), sdcyu(), sdxkey(), sdmkey(), scntfld(); +short et_null(void); +short ef_null(void); +short rd_null(void); +short nd_null(void); +void sdcxu(void); +void sdcyu(void); +void sdxkey(void); +void sdmkey(void); +short scntfld(short k); /* @@ -282,24 +341,20 @@ */ -short -et_null() +short et_null(void) { return(SUCCESS); } -short -ef_null() +short ef_null(void) { return(SUCCESS); } -short -rd_null() +short rd_null(void) { return(SUCCESS); } -short -nd_null() +short nd_null(void) { return(SUCCESS); @@ -316,5 +371,5 @@ */ -istart() +void istart(void) { register struct s_entry *ep, *pp, *tp; @@ -361,5 +416,5 @@ */ -icancel() +void icancel(void) { register struct s_entry *ep, *tp, *rp; @@ -412,6 +467,5 @@ */ -short -sdcxu() +void sdcxu(void) { if (sdmctl EQ 0) { /* typewriter up */ @@ -451,6 +505,5 @@ */ -short -sdcyu() +void sdcyu(void) { if (sdmctl EQ 0) { @@ -491,7 +544,5 @@ */ -short -scntfld(k) -short k; +short scntfld(short k) { register short grp, fnc, var; @@ -594,7 +645,5 @@ */ -short -cp2time(cx) -short cx; +short cp2time(short cx) { register long ct; @@ -619,8 +668,5 @@ */ -short -delevts(etp, thetime) -register short etp; -register long thetime; +short delevts(short etp, long thetime) { register struct s_entry *ep, *np; @@ -686,6 +732,5 @@ */ -short -deladat() +short deladat(void) { register struct s_entry *ep, *rp; @@ -802,6 +847,5 @@ */ -short -sdxkey() +void sdxkey(void) { register short col, grp, sect; @@ -1018,6 +1062,5 @@ */ -short -sdmkey() +void sdmkey(void) { if (astat) { @@ -1040,5 +1083,5 @@ */ -scfield() +void scfield(void) { curset(&sc_flds); Index: ram/scgoto.c =================================================================== --- ram/scgoto.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/scgoto.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -46,7 +46,5 @@ */ -int -sc_goto(tval) -register long tval; +int sc_goto(long tval) { register struct gdsel *gdsp; @@ -238,7 +236,5 @@ */ -short -sc_refr(t) -long t; +short sc_refr(long t) { short oldrs, rc; Index: ram/scinit.c =================================================================== --- ram/scinit.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/scinit.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -144,6 +144,5 @@ */ -long -evleft() +long evleft(void) { return(spcount + (se1_cnt * E_SIZE1) + (se2_cnt * E_SIZE2) + @@ -162,6 +161,5 @@ */ -long -scinit() +long scinit(void) { register long i, *cp; @@ -218,7 +216,5 @@ */ -struct s_entry * -e_clr(e1) -register struct s_entry *e1; +struct s_entry *e_clr(struct s_entry *e1) { switch (e1->e_size) { @@ -259,7 +255,5 @@ */ -struct s_entry * -e_ins(e1, e2) -register struct s_entry *e1, *e2; +struct s_entry *e_ins(struct s_entry *e1, struct s_entry *e2) { register struct s_entry *t1; @@ -280,7 +274,5 @@ */ -struct s_entry * -e_rmv(e1) -register struct s_entry *e1; +struct s_entry *e_rmv(struct s_entry *e1) { register struct s_entry *t1, *t2; @@ -306,7 +298,5 @@ */ -struct s_entry * -e_alc(w) -short w; +struct s_entry *e_alc(short w) { register struct s_entry *ev, *ex; @@ -463,7 +453,5 @@ */ -short -e_del(e1) -register struct s_entry *e1; +short e_del(struct s_entry *e1) { e_clr(e1); @@ -511,7 +499,5 @@ */ -eh_ins(ne, et) -register struct s_entry *ne; -short et; +void eh_ins(struct s_entry *ne, short et) { register struct s_entry *hp, *ep; @@ -567,7 +553,5 @@ */ -eh_rmv(ev, et) -register struct s_entry *ev; -short et; +void eh_rmv(struct s_entry *ev, short et) { if (hplist[curscor][et] EQ ev) /* update hplist */ @@ -593,6 +577,5 @@ */ -sc_clr(ns) -register short ns; +void sc_clr(short ns) { register struct s_entry *dsp, *nsp; @@ -635,7 +618,5 @@ */ -short -selscor(ns) -register short ns; +short selscor(short ns) { register short oldscor, grp; Index: ram/scope.c =================================================================== --- ram/scope.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/scope.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -28,5 +28,6 @@ char scopebf[65]; /* scope display buffer */ -extern short nokey(), stdmkey(); +extern short nokey(void); +extern void stdmkey(void); extern short astat; @@ -39,5 +40,5 @@ /* forward reference */ -short scptogl(); +void scptogl(void); /* @@ -80,6 +81,5 @@ */ -scope(val) -register unsigned val; +void scope(unsigned val) { register short i; @@ -134,6 +134,5 @@ */ -short -scptogl() +void scptogl(void) { if (NOT astat) @@ -153,5 +152,5 @@ */ -scopeon() +void scopeon(void) { scopeob = &v_score[0]; Index: ram/scordsp.c =================================================================== --- ram/scordsp.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/scordsp.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -34,5 +34,5 @@ */ -extern unsigned exp_c(); +extern unsigned exp_c(unsigned c); /* variables defined elsewhere */ @@ -194,6 +194,5 @@ */ -makeln(lnc, lew) -register unsigned lnc, lew; +void makeln(unsigned lnc, unsigned lew) { register unsigned *lp, *cp; @@ -279,5 +278,5 @@ */ -ds_vmod() +void ds_vmod(void) { if (ndisp NE 2) @@ -297,5 +296,5 @@ */ -ds_vel() +void ds_vel(void) { register short i; @@ -327,6 +326,5 @@ */ -dsvmode(n) -short n; +void dsvmode(short n) { if (ndisp NE 2) @@ -346,5 +344,5 @@ */ -ds_anmd() +void ds_anmd(void) { register short i; @@ -367,5 +365,5 @@ */ -ds_angr() +void ds_angr(void) { char buf[4]; @@ -391,5 +389,5 @@ */ -ds_anrs() +void ds_anrs(void) { register short i; @@ -422,6 +420,5 @@ */ -dsanval(var) -short var; +void dsanval(short var) { register short tmp, val, v1, v2; @@ -448,5 +445,5 @@ */ -ds_anvl() +void ds_anvl(void) { register short i; @@ -469,5 +466,5 @@ */ -uclk() +void uclk(void) { if (sliders NE LS_VOICE) { @@ -496,5 +493,5 @@ */ -dclkmd() +void dclkmd(void) { uclk(); @@ -520,5 +517,5 @@ */ -dsclk() +void dsclk(void) { short atr[26]; @@ -553,5 +550,5 @@ */ -dssect() +void dssect(void) { if (ndisp NE 2) @@ -576,5 +573,5 @@ */ -dslocn() +void dslocn(void) { register long curfr, beat; @@ -606,5 +603,5 @@ */ -dnedmod() +void dnedmod(void) { if (ndisp NE 2) @@ -625,5 +622,5 @@ */ -dsmem() +void dsmem(void) { if (ndisp NE 2) @@ -648,6 +645,5 @@ */ -dsgstat(n) -short n; +void dsgstat(short n) { char c; @@ -669,6 +665,5 @@ */ -dsgmode(n) -short n; +void dsgmode(short n) { if (ndisp NE 2) @@ -691,5 +686,5 @@ */ -dsgmods() +void dsgmods(void) { register short i; @@ -711,5 +706,5 @@ */ -dsgmodz() +void dsgmodz(void) { register short i; @@ -735,5 +730,5 @@ */ -dsrpmod() +void dsrpmod(void) { short atr[25]; @@ -798,5 +793,5 @@ */ -dsimode() +void dsimode(void) { short atr[7]; @@ -826,6 +821,5 @@ */ -sdwin(n) -short n; +void sdwin(short n) { short atr[64], atrib, i; @@ -993,5 +987,5 @@ */ -sdwins() +void sdwins(void) { register short i; @@ -1014,5 +1008,5 @@ */ -sdsetup() +void sdsetup(void) { dswap(); /* clear the video display */ Index: ram/scread.c =================================================================== --- ram/scread.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/scread.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -16,5 +16,5 @@ #include "libdsp.h" -extern short scskip(); +extern short scskip(FILE *fp, short ns); extern long schksum; /* score checksum */ @@ -40,7 +40,5 @@ */ -scioerr(sn, ep) -short sn; -struct s_entry *ep; +void scioerr(short sn, struct s_entry *ep) { char scid[40]; @@ -66,5 +64,5 @@ */ -noevent(sn) +void noevent(sn) { char scid[24]; @@ -89,8 +87,5 @@ */ -short -scread(ns, fp) -short ns; -register FILE *fp; +short scread(short ns, FILE *fp) { register struct s_entry *ep; Index: ram/scselbx.c =================================================================== --- ram/scselbx.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/scselbx.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -30,5 +30,8 @@ /* functions defined elsewhere */ -extern short enterit(), advscur(), oktode(), nokey(); +extern void enterit(void); +extern void advscur(void); +extern short oktode(struct s_entry *ep); +extern short nokey(void); /* @@ -113,5 +116,8 @@ /* forward references */ -short sdboxfn(), bspscur(), svtdsp(), svtstop(); +short sdboxfn(short n); +void bspscur(void); +void svtdsp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf); +void svtstop(void); /* @@ -248,6 +254,5 @@ */ -short -insect() +short insect(void) { register short col; @@ -272,10 +277,5 @@ */ -short -svtdsp(obj, fg, bg, row, col, buf) -unsigned *obj; -unsigned fg, bg; -short row, col; -char *buf; +void svtdsp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf) { if (v_regs[5] & 0x0180) @@ -295,6 +295,5 @@ */ -short -svtstop() +void svtstop(void) { sdmenu(-1); @@ -307,6 +306,5 @@ */ -short -bspscur() +void bspscur(void) { register short newcol; @@ -337,5 +335,5 @@ */ -dsects() +void dsects(void) { register short atr, row, col, i, j; @@ -416,6 +414,5 @@ */ -dsgtmn(n, f) -short n, f; +void dsgtmn(short n, short f) { char buf[4]; @@ -439,6 +436,5 @@ */ -dsgtme(n) -short n; +void dsgtme(short n) { char buf[4]; @@ -468,5 +464,5 @@ */ -dsgtmap() +void dsgtmap(void) { char buf[6]; @@ -493,6 +489,5 @@ */ -short -ingroup() +short ingroup(void) { register short col; @@ -519,8 +514,5 @@ */ -sdmtxt(row, col, txt, tag) -short row, col; -char *txt; -short tag; +void sdmtxt(short row, short col, char *txt, short tag) { if ((v_regs[5] & 0x0180) NE 0x0100) @@ -540,6 +532,5 @@ */ -showam(asg) -register short asg; +void showam(short asg) { register short col, na, row; @@ -579,5 +570,5 @@ */ -showtm() +void showtm(void) { register short row, tun; @@ -605,5 +596,5 @@ */ -showsm() +void showsm(void) { register short col, row, scr; @@ -640,6 +631,5 @@ */ -scmenu(n) -register short n; +void scmenu(short n) { register short i; @@ -750,6 +740,5 @@ */ -sdmenu(n) -register short n; +void sdmenu(short n) { register short i, wasup; @@ -906,6 +895,5 @@ */ -hilitnt(nop) -short nop; +void hilitnt(short nop) { noteop = nop; /* set note operation */ @@ -925,6 +913,5 @@ */ -hilitop(n) -register short n; +void hilitop(short n) { register short row, lc, rc, col; @@ -966,5 +953,5 @@ */ -dosecop() +void dosecop(void) { register short sect; @@ -1178,6 +1165,5 @@ */ -clkset(st) -register short st; +void clkset(short st) { clkrun = st; @@ -1246,7 +1232,5 @@ */ -short -sdboxfn(n) -short n; +short sdboxfn(short n) { register short row, col, grp, what, i; Index: ram/sctrak.c =================================================================== --- ram/sctrak.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/sctrak.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -56,7 +56,5 @@ */ -int -sc_trak(tval) -register long tval; +int sc_trak(long tval) { register struct s_entry *rpb, *rpc, *rpf; @@ -330,7 +328,5 @@ */ -int -sc_trek(tval) -register long tval; +int sc_trek(long tval) { register struct s_entry *rp, *ep; Index: ram/scwrite.c =================================================================== --- ram/scwrite.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/scwrite.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -23,5 +23,5 @@ #endif -extern long chksum(); +extern long chksum(char *area, long len); extern long schksum; /* score checksum */ @@ -83,7 +83,5 @@ */ -long -scsize(sn) -short sn; +long scsize(short sn) { register long nb, nl, sc; @@ -209,6 +207,5 @@ */ -long -scsizer() +long scsizer(void) { register short i; @@ -260,8 +257,5 @@ */ -short -scwrite(sn, fp) -short sn; -register FILE *fp; +short scwrite(short sn, FILE *fp) { register struct s_entry *ep; Index: ram/seccpy.c =================================================================== --- ram/seccpy.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/seccpy.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -30,9 +30,12 @@ #endif -extern short chksec(), oktocm(), oktode(), oktodg(); - -extern long sizesec(); - -extern struct s_entry *madjsec(); +extern short chksec(short ns); +extern short oktocm(struct s_entry *ep); +extern short oktode(struct s_entry *ep); +extern short oktodg(struct s_entry *ep); + +extern long sizesec(void); + +extern struct s_entry *madjsec(struct s_entry *sbp, long btime); extern short grptran; @@ -58,7 +61,5 @@ */ -short -sec_cpy(ns) -register short ns; +short sec_cpy(short ns) { register struct s_entry *cp, *lp, *rp; @@ -143,7 +144,5 @@ */ -short -sec_mrg(ns) -register short ns; +short sec_mrg(short ns) { register struct s_entry *cp, *lp, *rp; @@ -225,7 +224,5 @@ */ -short -sec_grp(ns) -register short ns; +short sec_grp(short ns) { register struct s_entry *cp, *rp; @@ -313,7 +310,5 @@ */ -short -sec_mov(ns) -register short ns; +short sec_mov(short ns) { register struct s_entry *cp, *lp, *rp; @@ -518,7 +513,5 @@ */ -short -sec_rmv(ns) -register short ns; +short sec_rmv(short ns) { register struct s_entry *cp, *lp, *rp; @@ -630,7 +623,5 @@ */ -short -sec_dgr(ns) -register short ns; +short sec_dgr(short ns) { register struct s_entry *lp, *rp; @@ -708,7 +699,5 @@ */ -short -sec_dev(ns) -register short ns; +short sec_dev(short ns) { register struct s_entry *lp, *rp; Index: ram/sedump.c =================================================================== --- ram/sedump.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/sedump.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -108,7 +108,5 @@ */ -char * -ev_kind(sep) -struct s_entry *sep; +char *ev_kind(struct s_entry *sep) { if ((sep->e_type & 0x00FF) GE N_ETYPES) { @@ -133,5 +131,5 @@ */ -SEctrl() +void SEctrl(void) { printf("curscor: %d \"%-16.16s\" cursect: %d scp: $%08lX\n\n", @@ -157,5 +155,5 @@ */ -SEsnap() +void SEsnap(void) { register short i, j; @@ -211,7 +209,5 @@ */ -struct s_entry * -SEdump(sep) -struct s_entry *sep; +struct s_entry *SEdump(struct s_entry *sep) { char *et; @@ -284,8 +280,5 @@ */ -struct s_entry * -SEchase(ep, n) -register struct s_entry *ep; -register long n; +struct s_entry *SEchase(struct s_entry *ep, long n) { register long i; @@ -336,5 +329,5 @@ */ -SLdump() +void SLdump(void) { register short i; @@ -379,5 +372,5 @@ */ -SECdump() +void SECdump(void) { register short i; @@ -443,5 +436,5 @@ */ -DOA() +void DOA(void) { register long *olda6, *cura6; @@ -501,5 +494,5 @@ */ -SCPanic() +void SCPanic(void) { SEsnap(); /* control data */ @@ -513,5 +506,5 @@ */ -SCdump() +void SCdump(void) { SEsnap(); /* control data */ @@ -527,5 +520,5 @@ */ -SCcrash() +void SCcrash(void) { SL_Flag = TRUE; @@ -540,5 +533,5 @@ */ -SCtimes() +void SCtimes(void) { SEctrl(); @@ -556,5 +549,5 @@ */ -SCslice() +void SCslice(void) { register short i, s; @@ -659,5 +652,5 @@ */ -SCvce(n) +void SCvce(n) { register short i, j, pif, pt1; @@ -748,5 +741,5 @@ */ -SCvces() +void SCvces(void) { register short i; @@ -764,5 +757,5 @@ */ -SCvoice() +void SCvoice(void) { SCvce(SCnumv); Index: ram/select.c =================================================================== --- ram/select.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/select.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -36,6 +36,5 @@ */ -short -whatbox() +short whatbox(void) { register struct selbox *sb; @@ -97,5 +96,5 @@ */ -select() +void select(void) { if (astat) { /* only when the E key goes down */ Index: ram/sendval.c =================================================================== --- ram/sendval.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/sendval.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -27,7 +27,7 @@ /* functions defined elsewhere */ -extern unsigned tofpu(); - -extern int setipl(); +extern unsigned tofpu(unsigned time); + +extern unsigned setipl(unsigned arg); extern short amplval, ext_cv1, ext_cv2, ext_cv3, ext_cv4, ext_mod; @@ -66,6 +66,5 @@ */ -sendval(voice, par, ival) -short voice, par, ival; +void sendval(short voice, short par, short ival) { register unsigned *fpu; @@ -141,6 +140,5 @@ */ -clearer(stat, sig) -short stat, sig; +void clearer(short stat, short sig) { register unsigned *fpu; Index: ram/setgc.c =================================================================== --- ram/setgc.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/setgc.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -10,5 +10,5 @@ #include "fields.h" -extern short infield(); +extern short infield(short row, short col, struct fet *fetp); extern short cmtype; @@ -25,6 +25,5 @@ */ -setgc(xv, yv) -register short xv, yv; +void setgc(short xv, short yv) { gcurpos(xv, yv); @@ -55,6 +54,5 @@ */ -settc(rv, cv) -register short rv, cv; +void settc(short rv, short cv) { itcpos(rv, cv); Index: ram/setv2gi.c =================================================================== --- ram/setv2gi.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/setv2gi.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -33,6 +33,5 @@ */ -setv2gi(group) -short group; +void setv2gi(short group) { register short grp, vce, ins; Index: ram/setwq.c =================================================================== --- ram/setwq.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/setwq.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -29,9 +29,5 @@ */ -unsigned short -setwq(qp, qadr, qsiz, hi, lo) -register struct wordq *qp; -unsigned short *qadr; -unsigned short qsiz, hi, lo; +unsigned short setwq(struct wordq *qp, unsigned short *qadr, unsigned short qsiz, unsigned short hi, unsigned short lo) { if ((unsigned short *)0L EQ qadr) @@ -71,8 +67,5 @@ */ -short -putwq(qp, c) -register struct wordq *qp; -register unsigned short c; +short putwq(struct wordq *qp, unsigned short c) { if (0 NE qp->qsize) { /* verify queue is ok */ @@ -119,8 +112,5 @@ */ -short -getwq(qp, p) -register struct wordq *qp; -register unsigned short *p; +short getwq(struct wordq *qp, unsigned short *p) { if (0 NE qp->qsize) { /* check queue is ok */ Index: ram/showcfg.c =================================================================== --- ram/showcfg.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/showcfg.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -31,16 +31,22 @@ /* external functions */ -extern unsigned exp_c(); - -extern short enterit(); -extern short idpoint(); -extern short nokey(); - -extern short et_mcfn(), ef_mcfn(), rd_mcfn(), nd_mcfn(); -extern short et_mwsn(), ef_mwsn(), rd_mwsn(), nd_mwsn(); +extern unsigned exp_c(unsigned c); + +extern void enterit(void); +extern void idpoint(short x, short y, short pen); +extern short nokey(void); + +extern short et_mcfn(short n); +extern short ef_mcfn(short n); +extern short rd_mcfn(short n); +extern short nd_mcfn(short n, short k); +extern short et_mwsn(short nn); +extern short ef_mwsn(short nn); +extern short rd_mwsn(short nn); +extern short nd_mwsn(short nn, short k); /* forward references */ -short imfnbox(); +void imfnbox(short n); /* @@ -360,6 +366,5 @@ */ -putpat(pn, px, py, patc) -short pn, px, py, patc; +void putpat(short pn, short px, short py, short patc) { register short xp, yp, pr, pc; @@ -402,6 +407,5 @@ */ -dispcfg(nn) -register short nn; +void dispcfg(short nn) { register short i, np; @@ -439,6 +443,5 @@ */ -showcfg(nn) -short nn; +void showcfg(short nn) { LftEdge = LFT_EDGE; @@ -468,6 +471,5 @@ */ -dispws(ws) -short ws; +void dispws(short ws) { register unsigned *wsp; @@ -504,6 +506,5 @@ */ -wcmenu(wc) -short wc; +void wcmenu(short wc) { register short i; @@ -610,7 +611,5 @@ */ -short -imfnbox(n) -short n; +void imfnbox(short n) { register short row, col; Index: ram/smscrl.c =================================================================== --- ram/smscrl.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/smscrl.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -96,6 +96,5 @@ */ -char * -LineFwd() +char *LineFwd(void) { register short j, k; @@ -147,6 +146,5 @@ */ -char * -LineBak() +char *LineBak(void) { register short j, k; @@ -198,8 +196,5 @@ */ -WrVideo(row, col, str, atr) -register short row, col; -register char *str; -register unsigned short atr; +void WrVideo(short row, short col, char *str, unsigned short atr) { register char chr; @@ -227,6 +222,5 @@ */ -SetDTop(row, scan) -short row, scan; +void SetDTop(short row, short scan) { if (v_regs[5] & 0x0180) @@ -253,8 +247,5 @@ */ -UpdVid(row, col, str, atr) -short row, col; -char *str; -unsigned short atr; +void UpdVid(short row, short col, char *str, unsigned short atr) { WrVideo(CurLine + row, col, str, atr); @@ -281,5 +272,5 @@ */ -bgncm() +void bgncm(void) { register short j; @@ -313,5 +304,5 @@ */ -stopcm() +void stopcm(void) { register short i; @@ -355,5 +346,5 @@ */ -stopsm() +void stopsm(void) { register short i; @@ -383,5 +374,5 @@ */ -smscrl() +void smscrl(void) { if (PdScUpF) { /* SCROLL UP (toward NEW data) ? */ @@ -483,5 +474,5 @@ */ -smxupd() +void smxupd(void) { short oldcx; @@ -548,6 +539,5 @@ */ -smy_up(tag) -short tag; +void smy_up(short tag) { @@ -591,5 +581,5 @@ */ -smyupd() +void smyupd(void) { if (submenu) { @@ -619,6 +609,5 @@ */ -sqy_up(tag) -short tag; +void sqy_up(short tag) { if (ctcsw) @@ -649,5 +638,5 @@ */ -sqyupd() +void sqyupd(void) { if (submenu) { Index: ram/sqdisp.c =================================================================== --- ram/sqdisp.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/sqdisp.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -23,5 +23,5 @@ #endif -extern short nokey(); +extern short nokey(void); extern char *(*BakLine)(), *(*FwdLine)(); @@ -142,5 +142,5 @@ */ -initsq() +void initsq(void) { register short i; @@ -169,7 +169,5 @@ */ -dsact(buf, act, dat) -char *buf; -unsigned short act, dat; +void dsact(char *buf, unsigned short act, unsigned short dat) { unsigned short sqa, sqd, sqf, sqr, sqt, t1, t2, val; @@ -288,7 +286,5 @@ */ -dsqlin(buf, slin) -char *buf; -short slin; +void dsqlin(char *buf, short slin) { register struct seqent *sp; @@ -325,5 +321,5 @@ */ -dcursq() +void dcursq(void) { dsqlin(TheBuf, curslin); @@ -338,5 +334,5 @@ */ -dstw() +void dstw(void) { register short slin, srow; @@ -370,6 +366,5 @@ */ -sqwin(n) -short n; +void sqwin(short n) { register short i, j; @@ -518,6 +513,5 @@ */ -char * -SqBakLn() +char *SqBakLn(void) { register short slin; @@ -545,6 +539,5 @@ */ -char * -SqFwdLn() +char *SqFwdLn(void) { register short slin; @@ -568,5 +561,5 @@ */ -sqwins() +void sqwins(void) { register short i; @@ -586,5 +579,5 @@ */ -sqdisp() +void sqdisp(void) { #if DEBUGSQ Index: ram/sqdkey.c =================================================================== --- ram/sqdkey.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/sqdkey.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -53,5 +53,5 @@ */ -seq2buf() +void seq2buf(void) { memcpyw(&seqbuf, &seqtab[curslin], NSEQW); @@ -70,6 +70,5 @@ */ -sqactde(key) -register short key; +void sqactde(short key) { register short col; @@ -389,5 +388,5 @@ */ -sqdkey() +void sqdkey(void) { register short key; Index: ram/sqexec.c =================================================================== --- ram/sqexec.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/sqexec.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -34,6 +34,6 @@ #endif -extern unsigned short setsr(); -extern long rand24(); +extern unsigned setsr(unsigned sr); +extern long rand24(void); extern char trgtab[]; @@ -66,7 +66,5 @@ */ -unsigned short -evaltv(dat) -register unsigned short dat; +unsigned short evaltv(unsigned short dat) { switch (SQ_MTYP & dat) { @@ -104,8 +102,5 @@ */ -short -dosqact(seq, act, dat) -unsigned short seq; -register unsigned short act, dat; +short dosqact(unsigned short seq, unsigned short act, unsigned short dat) { register unsigned short obj, val; @@ -274,6 +269,5 @@ */ -sqexec(seq) -register unsigned short seq; +void sqexec(unsigned short seq) { register unsigned short act, dat, line; @@ -358,5 +352,5 @@ */ -seqproc() +void seqproc(void) { register unsigned short oldsr, seq; Index: ram/sqfield.c =================================================================== --- ram/sqfield.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/sqfield.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -30,8 +30,15 @@ extern short (*curtype)(); -extern short select(), nokey(), stdctp5(); -extern short cxkstd(), cykstd(), stdmkey(), stddkey(); -extern short stopsm(), smxupd(), sqyupd(); -extern short postcm(); +extern void select(void); +extern short nokey(void); +extern short stdctp5(void); +extern void cxkstd(void); +extern void cykstd(void); +extern void stdmkey(void); +extern void stddkey(void); +extern void stopsm(void); +extern void smxupd(void); +extern void sqyupd(void); +extern void postcm(void); extern short astat; @@ -61,8 +68,8 @@ extern char sqdebuf[]; -short sqxkey(); /* forward reference */ -short sqekey(); /* forward reference */ -short sqmkey(); /* forward reference */ -short sqdkey(); /* forward reference */ +void sqxkey(void); +void sqekey(void); +void sqmkey(void); +void sqdkey(void); /* @@ -105,6 +112,5 @@ */ -short -sqmkey() +void sqmkey(void) { register short nc; @@ -162,6 +168,5 @@ */ -short -sqekey() +void sqekey(void) { register short nc; @@ -219,6 +224,5 @@ */ -short -sqxkey() +void sqxkey(void) { if (NOT astat) @@ -272,5 +276,5 @@ */ -sqfield() +void sqfield(void) { Index: ram/sqread.c =================================================================== --- ram/sqread.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/sqread.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -24,5 +24,5 @@ */ -sqioerr() +void sqioerr(void) { char erms[40]; @@ -46,7 +46,5 @@ */ -short -sqread(fp) -register FILE *fp; +short sqread(FILE *fp) { char cb; Index: ram/sqscan.c =================================================================== --- ram/sqscan.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/sqscan.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -40,6 +40,5 @@ */ -nospace(et) -char *et; +void nospace(char *et) { @@ -68,8 +67,5 @@ */ -int -Pcheck(ptr, msg) -struct s_entry *ptr; -char *msg; +int Pcheck(struct s_entry *ptr, char *msg) { register struct s_entry *cval; @@ -123,8 +119,5 @@ */ -struct n_entry * -insnevt(nsp, nt, grp, note, vel) -register struct n_entry *nsp; -short nt, grp, note, vel; +struct n_entry *insnevt(struct n_entry *nsp, short nt, short grp, short note, short vel) { nsp->e_time = t_cur; @@ -147,6 +140,5 @@ */ -int -Qevent() +int Qevent(void) { register int aux1, aux2, aux3, aux4, aux5; @@ -866,6 +858,5 @@ */ -int -Qnote() +int Qnote(void) { struct n_entry *nsp1; @@ -1035,6 +1026,5 @@ */ -int -Qadv() +int Qadv(void) { if (CM_CHR('.')) { /* advance by 1 frame */ @@ -1080,6 +1070,5 @@ */ -int -Qseq() +int Qseq(void) { CM_DBLK; @@ -1121,5 +1110,5 @@ */ -sqinit() +void sqinit(void) { verbose = FALSE; @@ -1152,7 +1141,5 @@ */ -int -sqscan(ip) -char *ip; +int sqscan(char *ip) { endflg = FALSE; Index: ram/sqselbx.c =================================================================== --- ram/sqselbx.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/sqselbx.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -51,5 +51,5 @@ struct seqent seqbuf; /* sequence line buffer */ -short sqfnbox(); +short sqfnbox(short n); /* @@ -136,6 +136,5 @@ */ -hilitsq(n) -register char n; +void hilitsq(char n) { register short chr, h, v, w; @@ -167,5 +166,5 @@ */ -postcm() +void postcm(void) { if (inrange(stccol, 12, 22)) { @@ -219,6 +218,5 @@ */ -movestc(r, c) -short r, c; +void movestc(short r, short c) { ctcpos(r, c); @@ -232,6 +230,5 @@ */ -endssm(row, col) -short row, col; +void endssm(short row, short col) { submenu = FALSE; @@ -253,6 +250,5 @@ */ -setsqm(r, c) -short r, c; +void setsqm(short r, short c) { submenu = TRUE; @@ -271,6 +267,5 @@ */ -short -sqenter() +short sqenter(void) { register short i, lcol; @@ -498,7 +493,5 @@ */ -short -sqfnbox(n) -short n; +short sqfnbox(short n) { short act, vtype; Index: ram/sqwrite.c =================================================================== --- ram/sqwrite.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/sqwrite.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -22,5 +22,5 @@ #endif -extern long chksum(); +extern long chksum(char *area, long len); /* @@ -35,6 +35,5 @@ */ -long -sqsizer() +long sqsizer(void) { register short i, na; @@ -84,7 +83,5 @@ */ -short -sqwrite(fp) -register FILE *fp; +short sqwrite(FILE *fp) { short seq; Index: ram/stcpos.c =================================================================== --- ram/stcpos.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/stcpos.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -21,5 +21,5 @@ #define SDLINE 4 /* dividing line color - analog stuff */ -extern unsigned exp_c(); +extern unsigned exp_c(unsigned c); extern unsigned *STCOBJ; /* text cursor address in VSDD RAM */ @@ -170,5 +170,5 @@ */ -stcclr() +void stcclr(void) { register unsigned *obj; @@ -214,5 +214,5 @@ */ -stcoff() +void stcoff(void) { register unsigned ccv, *tcp; @@ -244,6 +244,5 @@ */ -stcpos(row, col) -short row, col; +void stcpos(short row, short col) { register unsigned *ccp, *tcp; @@ -286,5 +285,5 @@ */ -advscur() +void advscur(void) { register short newcol; @@ -307,5 +306,5 @@ */ -stcset() +void stcset(void) { memcpyw(&sctctab[0][0], &sctccon[0][0], 640); Index: ram/stmproc.c =================================================================== --- ram/stmproc.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/stmproc.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -100,5 +100,5 @@ */ -initpt() +void initpt(void) { register unsigned short i; @@ -142,6 +142,5 @@ */ -unsigned short -pt_alc() +unsigned short pt_alc(void) { register unsigned short pe; @@ -159,6 +158,5 @@ */ -pt_del(pe) -register unsigned short pe; +void pt_del(unsigned short pe) { patches[pe].nextstm = ptfree; @@ -176,6 +174,5 @@ */ -unsigned short -dt_alc() +unsigned short dt_alc(void) { register unsigned short de; @@ -193,6 +190,5 @@ */ -dt_del(de) -register unsigned short de; +void dt_del(unsigned short de) { defents[de].nextdef = dtfree; @@ -215,7 +211,5 @@ */ -short -cprdpe(np) -unsigned short np; +short cprdpe(unsigned short np) { register unsigned short ca, cb, ct; @@ -280,6 +274,5 @@ */ -short -finddpe() +short finddpe(void) { register unsigned short c, idef; @@ -377,7 +370,5 @@ */ -short -cprpte(np) -unsigned short np; +short cprpte(unsigned short np) { register unsigned short ca, cb, ct; @@ -449,6 +440,5 @@ */ -short -findpte() +short findpte(void) { register unsigned short c, istim; @@ -541,5 +531,5 @@ */ -entrpte() +void entrpte(void) { register short c; @@ -721,6 +711,5 @@ */ -short -find1st() +short find1st(void) { register short cp, pp; @@ -739,7 +728,5 @@ */ -short -findnxt(cp) -short cp; +short findnxt(short cp) { register short np, stim; @@ -767,7 +754,5 @@ */ -short -findprv(cp) -short cp; +short findprv(short cp) { register short np, pp, stim; @@ -804,6 +789,5 @@ */ -dpte(pe, row, atr) -register short pe, row, atr; +void dpte(short pe, short row, short atr) { register short i; @@ -838,5 +822,5 @@ */ -dptw() +void dptw(void) { register short cp, r, row, pp; @@ -993,5 +977,5 @@ */ -srdspte() +void srdspte(void) { short oldcpos, oldpred, oldsucc; @@ -1080,6 +1064,5 @@ */ -stmproc(trg) -register unsigned short trg; +void stmproc(unsigned short trg) { register struct defent *nextdef; Index: ram/swinit.c =================================================================== --- ram/swinit.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/swinit.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -217,5 +217,5 @@ */ -swinit() +void swinit(void) { swflag = FALSE; /* stop the scroll wheel */ Index: ram/tdfield.c =================================================================== --- ram/tdfield.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/tdfield.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -17,13 +17,31 @@ #include "tundsp.h" -extern short select(), whatbox(), nokey(), stdctp0(); -extern short cxkstd(), cykstd(), stdmkey(), stddkey(); - -extern short et_null(), ef_null(), rd_null(), nd_null(); -extern short et_ttab(), ef_ttab(), rd_ttab(), nd_ttab(); -extern short et_tval(), ef_tval(), rd_tval(), nd_tval(); -extern short et_tpch(), ef_tpch(), rd_tpch(), nd_tpch(); - -extern char *memset(); +extern void select(void); +extern short whatbox(void); +extern short nokey(void); +extern short stdctp0(void); +extern void cxkstd(void); +extern void cykstd(void); +extern void stdmkey(void); +extern void stddkey(void); + +extern short et_null(void); +extern short ef_null(void); +extern short rd_null(void); +extern short nd_null(void); +extern short et_ttab(short n); +extern short ef_ttab(short n); +extern short rd_ttab(short nn); +extern short nd_ttab(short nn, short k); +extern short et_tval(short n); +extern short ef_tval(short n); +extern short rd_tval(short nn); +extern short nd_tval(short nn, short k); +extern short et_tpch(short nn); +extern short ef_tpch(short nn); +extern short rd_tpch(short nn); +extern short nd_tpch(short nn, short k); + +extern char *memset(char *sp, char c, int n); extern short cxval, cyval, cxrate, cyrate; @@ -40,5 +58,6 @@ /* forward references */ -short tdcxupd(), tdcyupd(); +void tdcxupd(void); +void tdcyupd(void); /* @@ -261,6 +280,5 @@ */ -short -tdcyupd() +void tdcyupd(void) { register short pval, vh, vl; @@ -296,6 +314,5 @@ */ -short -tdcxupd() +void tdcxupd(void) { @@ -330,5 +347,5 @@ */ -tdfield() +void tdfield(void) { tdnamsw = FALSE; Index: ram/tdselbx.c =================================================================== --- ram/tdselbx.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/tdselbx.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -14,7 +14,12 @@ #include "tundsp.h" -extern short enterit(), loc2key(), advtcur(), bsptcur(), vtdisp(), nokey(); - -extern unsigned exp_c(); +extern void enterit(void); +extern short loc2key(short row, short col); +extern void advtcur(void); +extern void bsptcur(void); +extern void vtdisp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf); +extern short nokey(void); + +extern unsigned exp_c(unsigned c); extern short hitbox, cxval, cyval, hitcx, hitcy, submenu; @@ -36,5 +41,6 @@ /* forward references */ -short bx_null(), tdfnbox(); +short bx_null(void); +short tdfnbox(short n); /* @@ -66,5 +72,5 @@ */ -endttyp() +void endttyp(void) { tdnamsw = FALSE; @@ -82,7 +88,5 @@ */ -short -tcoladj(icol) -short icol; +short tcoladj(short icol) { if (icol < 12) @@ -110,6 +114,5 @@ */ -tdhilit(from, to) -short from, to; +void tdhilit(short from, short to) { register short i, row, col, box; @@ -177,7 +180,5 @@ */ -short -tdfnbox(n) -short n; +short tdfnbox(short n) { register short i, key, dcol, row, col; Index: ram/ttcpos.c =================================================================== --- ram/ttcpos.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ttcpos.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -21,5 +21,5 @@ #define CW_F 0xFFFF -extern unsigned exp_c(); +extern unsigned exp_c(unsigned c); extern short vtcrow; /* virtual typewriter cursor row */ @@ -60,6 +60,5 @@ */ -ttcini(color) -unsigned color; +void ttcini(unsigned color) { if ((v_regs[5] & 0x0180) NE 0x0100) @@ -75,6 +74,5 @@ */ -ttcpos(row, col) -register short row, col; +void ttcpos(short row, short col) { register short yrow, xcol; Index: ram/tundsp.c =================================================================== --- ram/tundsp.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/tundsp.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -96,6 +96,5 @@ */ -gettun(n) -short n; +void gettun(short n) { memcpyw(tuntab, tunlib[n], 128); @@ -111,6 +110,5 @@ */ -puttun(n) -short n; +void puttun(short n) { memcpyw(tunlib[n], tuntab, 128); @@ -129,6 +127,5 @@ */ -inittt(n) -short n; +void inittt(short n) { register short i; @@ -151,5 +148,5 @@ */ -inittl() +void inittl(void) { register short i; @@ -173,6 +170,5 @@ */ -tt_trcp(start, finish, dest) -short start, finish, dest; +void tt_trcp(short start, short finish, short dest) { register short i; @@ -227,7 +223,5 @@ */ -short -tt_intp(from, to) -short from, to; +short tt_intp(short from, short to) { register short i, j, k, n; @@ -269,7 +263,5 @@ */ -short -tt_incr(from, to) -short from, to; +short tt_incr(short from, short to) { register short i; @@ -317,6 +309,5 @@ */ -td_trcp(mode) -short mode; +void td_trcp(short mode) { register unsigned cx; @@ -334,6 +325,5 @@ */ -td_incr(mode) -short mode; +void td_incr(short mode) { register unsigned cx; @@ -350,6 +340,5 @@ */ -td_intp(mode) -short mode; +void td_intp(short mode) { register unsigned cx; @@ -370,5 +359,5 @@ */ -advtcur() +void advtcur(void) { register short newcol; @@ -394,5 +383,5 @@ */ -bsptcur() +void bsptcur(void) { register short newcol; @@ -422,7 +411,5 @@ */ -dsttval(row, col, val, fg, bg) -short row, col, val; -unsigned fg, bg; +void dsttval(short row, short col, short val, unsigned fg, unsigned bg) { register unsigned cfg, cbg; @@ -454,6 +441,5 @@ */ -tdswin(n) -register short n; +void tdswin(short n) { register short cx, i, tv; @@ -601,5 +587,5 @@ */ -twins() +void twins(void) { register short i; @@ -619,5 +605,5 @@ */ -tundsp() +void tundsp(void) { tunob = &v_score[0]; /* setup object pointer */ Index: ram/ucslice.c =================================================================== --- ram/ucslice.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/ucslice.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -62,5 +62,5 @@ */ -ucslice() +void ucslice(void) { register unsigned *pxptr, *slptr; Index: ram/uslice.c =================================================================== --- ram/uslice.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/uslice.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -182,9 +182,5 @@ */ -short -uslice(slice, mask1, mask2, gdstb) -unsigned *slice; -register unsigned mask1, mask2; -struct gdsel *gdstb[]; +short uslice(unsigned *slice, unsigned mask1, unsigned mask2, struct gdsel *gdstb[]) { register unsigned *pxptr, *slptr; @@ -377,6 +373,5 @@ */ -rslice(gdstb) -struct gdsel *gdstb[]; +void rslice(struct gdsel *gdstb[]) { register struct gdsel *gdsep; @@ -501,9 +496,5 @@ */ -short -cslice(slice, mask1, mask2, gdstb) -unsigned *slice; -register unsigned mask1, mask2; -struct gdsel *gdstb[]; +short cslice(unsigned *slice, unsigned mask1, unsigned mask2, struct gdsel *gdstb[]) { register unsigned *pxptr, *slptr; @@ -681,5 +672,5 @@ */ -clrsctl() +void clrsctl(void) { register struct gdsel *gdsp, *gnxt, **gp; Index: ram/vtyper.c =================================================================== --- ram/vtyper.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/vtyper.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -14,5 +14,5 @@ #include "midas.h" -extern unsigned exp_c(); +extern unsigned exp_c(unsigned c); extern short cxrate; /* data entry cursor x (col) update increment */ @@ -79,12 +79,5 @@ */ -vtsetup(obj, dsp, col, ptr, tr, tc, adv, bsp, cup, cdn, stop, fg, bg) -unsigned *obj; -short (*dsp)(); -short col; -char *ptr; -short tr, tc; -short (*adv)(), (*bsp)(), (*cup)(), (*cdn)(), (*stop)(); -unsigned fg, bg; +void vtsetup(unsigned *obj, short (*dsp)(), short col, char *ptr, short tr, short tc, short (*adv)(), short (*bsp)(), short (*cup)(), short (*cdn)(), short (*stop)(), unsigned fg, unsigned bg) { vtobj = obj; /* setup object pointer */ @@ -122,5 +115,5 @@ */ -vtcxupd() +void vtcxupd(void) { vtccol = XTOC(vtxval += cxrate); @@ -143,5 +136,5 @@ */ -vtcyupd() +void vtcyupd(void) { vtcrow = YTOR(vtyval += cyrate); @@ -166,9 +159,5 @@ */ -vtdisp(obj, fg, bg, row, col, buf) -unsigned *obj; -unsigned fg, bg; -short row, col; -char *buf; +void vtdisp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf) { @@ -192,5 +181,5 @@ */ -vtyper() +int vtyper(void) { /* check for data entry */ Index: ram/wdselbx.c =================================================================== --- ram/wdselbx.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/wdselbx.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -19,5 +19,6 @@ #include "wsdsp.h" -extern short enterit(), wdswin(); +extern void enterit(void); +extern void wdswin(short n); extern short curvce, curwdth, cursbox, hitbox, cxval, cyval, hitcx, hitcy; @@ -45,5 +46,6 @@ /* forward references */ -short bx_null(), wdfnbox(); +short bx_null(void); +short wdfnbox(short n); /* @@ -69,5 +71,5 @@ */ -dsnewws() +void dsnewws(void) { wdswin(0); @@ -87,5 +89,5 @@ */ -newws() +void newws(void) { register short i; @@ -137,7 +139,5 @@ */ -short -wdfnbox(n) -short n; +short wdfnbox(short n) { register short wval; Index: ram/wheel.c =================================================================== --- ram/wheel.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/wheel.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -28,5 +28,5 @@ #include "midas.h" -extern unsigned short setipl(); +extern unsigned setipl(unsigned arg); #define M_FL_CT 1024 /* mouse flush count */ @@ -236,6 +236,5 @@ */ -MouseRT(t) -unsigned short t; +void MouseRT(unsigned short t) { unsigned short oldi; @@ -263,7 +262,5 @@ */ -MouseRD(str, nc, nt) -char *str; -short nc, nt; +int MouseRD(char *str, short nc, short nt) { long tc; @@ -295,6 +292,5 @@ */ -MouseWR(str) -char *str; +void MouseWR(char *str) { register unsigned short c; @@ -319,7 +315,5 @@ */ -short -MouseFL(tc) -short tc; +short MouseFL(short tc) { long flushed; @@ -365,6 +359,5 @@ */ -short -MouseWK() +short MouseWK(void) { short tries; @@ -437,6 +430,5 @@ */ -MouseEX(str) -char *str; +void MouseEX(char *str) { unsigned short oldi, msc, mst; @@ -576,6 +568,5 @@ */ -MouseIN(c) -short c; +void MouseIN(short c) { c &= 0x00FF; /* mask off extraneous bits from mouse input */ @@ -666,5 +657,5 @@ */ -wheel() +void wheel(void) { register short i, oldi; @@ -789,5 +780,5 @@ */ -txyup() +void txyup(void) { register short txndx, tyndx, txrate, tyrate; @@ -868,5 +859,5 @@ */ -txydn() +void txydn(void) { register short i; @@ -910,5 +901,5 @@ */ -txstd() +void txstd(void) { register short i, oldcx, oldi, txdelta, txcdvr; @@ -1006,5 +997,5 @@ */ -tystd() +void tystd(void) { register short i, oldcy, oldi, tydelta, tycdvr; @@ -1100,5 +1091,5 @@ */ -curproc() +void curproc(void) { register short i, cxprev, cyprev; @@ -1354,5 +1345,5 @@ */ -tkinit() +void tkinit(void) { trkball = FALSE; /* stop the trackball */ Index: ram/wscalc.c =================================================================== --- ram/wscalc.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/wscalc.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -40,6 +40,5 @@ */ -adj(wshar) -register short wshar; +void adj(short wshar) { register short wspnt; @@ -76,5 +75,5 @@ */ -wadj() +void wadj(void) { register short wshar; @@ -90,5 +89,5 @@ */ -clrwsa() +void clrwsa(void) { memsetw(offsets, 0, NUMWPCAL); @@ -107,5 +106,5 @@ */ -wscalc() +void wscalc(void) { register short wspnt, wshar; Index: ram/wsdsp.c =================================================================== --- ram/wsdsp.c (revision 73dd55fa7829434f02ca14204368a01905e44d46) +++ ram/wsdsp.c (revision 342a56fb7d496f8e81315e423dc9309308a74300) @@ -24,5 +24,5 @@ /* things defined elsewhere */ -extern unsigned exp_c(); +extern unsigned exp_c(unsigned c); extern int (*point)(); @@ -78,5 +78,5 @@ /* forward references */ -short wdpoint(); +void wdpoint(short x, short y, short pen); /* @@ -114,5 +114,5 @@ */ -advwcur() +void advwcur(void) { register short newcol; @@ -134,7 +134,5 @@ */ -hdraw(hv, h) -register short *hv; -short h; +void hdraw(short *hv, short h) { register short bc, bx, by, j; @@ -170,6 +168,5 @@ */ -dsws(how) -short how; +void dsws(short how) { register struct instdef *ip; @@ -224,6 +221,5 @@ */ -wdswin(n) -register short n; +void wdswin(short n) { register short cx, wval; @@ -375,5 +371,5 @@ */ -wwins() +void wwins(void) { register short i; @@ -389,7 +385,5 @@ */ -short -wdpoint(x, y, pen) -short x, y, pen; +void wdpoint(short x, short y, short pen) { if (v_regs[5] & 0x0180) @@ -409,5 +403,5 @@ */ -wdbord() +void wdbord(void) { point = wdpoint; @@ -436,5 +430,5 @@ */ -clrws() +void clrws(void) { register struct instdef *ip; @@ -477,5 +471,5 @@ */ -iniwslb() +void iniwslb(void) { register short i, j; @@ -505,5 +499,5 @@ */ -wsdsp() +void wsdsp(void) { waveob = &v_score[0]; /* setup object pointer */