Changeset df097bf in buchla-68k for ram

Timestamp:

07/01/2017 10:09:33 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

c091ef8

Parents:

9bf0f86

Message:

Code compiles, doesn't link.

Location:

ram

Files:

• adfield.c (modified) (2 diffs)
• idfield.c (modified) (6 diffs)
• instdsp.c (modified) (1 diff)
• lcdlbls.c (modified) (17 diffs)
• ldfield.c (modified) (5 diffs)
• libdsp.c (modified) (1 diff)
• nedacc.c (modified) (1 diff)
• ptfield.c (modified) (3 diffs)
• scadv.c (modified) (1 diff)
• scfield.c (modified) (4 diffs)
• scope.c (modified) (1 diff)
• scselbx.c (modified) (3 diffs)
• scwrite.c (modified) (1 diff)
• sedump.c (modified) (1 diff)
• showcfg.c (modified) (2 diffs)
• smscrl.c (modified) (1 diff)
• sqfield.c (modified) (4 diffs)
• sqscan.c (modified) (1 diff)
• tdfield.c (modified) (2 diffs)
• wdfield.c (modified) (4 diffs)
• wsdsp.c (modified) (1 diff)

ram/adfield.c

@@ -252 +252 @@
 */
 
+short
 adcyupd()
 {
@@ -280 +281 @@
 */
 
+short
 adcxupd()
 {

ram/idfield.c

@@ -33 +33 @@
 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();
@@ -164 +165 @@
 */
 
+short
 ikydn()
 {
@@ -175 +177 @@
 */
 
+short
 ikyup()
 {
@@ -190 +193 @@
 */
 
+short
 idcyupd()
 {
@@ -259 +263 @@
 */
 
+short
 idcxupd()
 {
@@ -481 +486 @@
 */
 
+short
 idx_key()
 {

ram/instdsp.c

@@ -902 +902 @@
 */
 
+short
 idpoint(x, y, pen)
 short x, y, pen;

ram/lcdlbls.c

@@ -432 +432 @@
 */
 
+short
 quiet()
 {
@@ -455 +456 @@
 */
 
+short
 rpctl(stat)
 short stat;
@@ -475 +477 @@
 */
 
+short
 trapper(stat)
 short stat;
@@ -488 +491 @@
 */
 
+short
 l_clock(stat)
 short stat;
@@ -577 +581 @@
 */
 
+short
 setlamp(stat)
 {
@@ -720 +725 @@
 */
 
+short
 l_load(stat)
 short stat;
@@ -1016 +1022 @@
 */
 
+short
 l_adfl(stat)
 short stat;
@@ -1035 +1042 @@
 */
 
+short
 l_asgn(stat)
 short stat;
@@ -1109 +1117 @@
 */
 
+short
 l_inst(stat)
 short stat;
@@ -1250 +1259 @@
 */
 
+short
 l_dflt(stat)
 short stat;
@@ -1269 +1279 @@
 */
 
+short
 l_goto(stat)
 short stat;
@@ -1589 +1600 @@
 */
 
+short
 l_prmtr(stat, sig)
 short stat, sig;
@@ -1627 +1639 @@
 */
 
+short
 l_voice(stat, vce)
 short stat, vce;
@@ -1674 +1687 @@
 */
 
+short
 l_group(stat, grp)
 short stat, grp;
@@ -1698 +1712 @@
 */
 
+short
 l_other(stat, sig)
 short stat, sig;
@@ -1720 +1735 @@
 */
 
+short
 l_eq(stat, sig)
 short stat, sig;
@@ -1764 +1780 @@
 */
 
+short
 l_init(stat, sig)
 short stat, sig;

ram/ldfield.c

@@ -326 +326 @@
 */
 
+short
 ld_prmv()
 {
@@ -349 +350 @@
 */
 
+short
 ldcyupd()
 {
@@ -376 +378 @@
 */
 
+short
 ldcxupd()
 {
@@ -403 +406 @@
 */
 
+short
 ldmkey()
 {
@@ -479 +483 @@
 */
 
+short
 ldkey(k)
 short k;

ram/libdsp.c

@@ -1751 +1751 @@
 */
 
+short
 ldpoint(x, y, pen)
 short x, y, pen;

ram/nedacc.c

@@ -215 +215 @@
 register short grp, note;
 {
-        register struct s_entry *ep, *np;
+        register struct s_entry *ep;
+        register struct n_entry *np;
         register short et;
 

ram/ptfield.c

@@ -145 +145 @@
 */
 
+short
 ptmkey()
 {
@@ -201 +202 @@
 */
 
+short
 ptekey()
 {
@@ -257 +259 @@
 */
 
+short
 ptxkey()
 {

ram/scadv.c

@@ -238 +238 @@
         if ((ndisp EQ 2) AND (scrl NE pscrl)) {
 
-                sword = (unsigned)((char *)saddr >> 1);
+                sword = (unsigned)((long)saddr >> 1);
 
                 setipl(VID_DI);         /* disable video interrupts */

ram/scfield.c

@@ -412 +412 @@
 */
 
+short
 sdcxu()
 {
@@ -450 +451 @@
 */
 
+short
 sdcyu()
 {
@@ -800 +802 @@
 */
 
+short
 sdxkey()
 {
@@ -1015 +1018 @@
 */
 
+short
 sdmkey()
 {

ram/scope.c

@@ -134 +134 @@
 */
 
+short
 scptogl()
 {

ram/scselbx.c

@@ -272 +272 @@
 */
 
+short
 svtdsp(obj, fg, bg, row, col, buf)
 unsigned *obj;
@@ -294 +295 @@
 */
 
+short
 svtstop()
 {
@@ -305 +307 @@
 */
 
+short
 bspscur()
 {

ram/scwrite.c

@@ -142 +142 @@
 
                         sc += ep->e_type + ep->e_time + ep->e_data1
-                              + ep->e_data2 + (struct n_entry *)ep->e_vel;
+                              + ep->e_data2 + ((struct n_entry *)ep)->e_vel;
 
                         break;

ram/sedump.c

@@ -253 +253 @@
         if (sep->e_size EQ E_SIZE1)
                 printf(" $%04.4X $%04.4X",
-                        (struct n_entry *)sep->e_vel,
-                        (struct n_entry *)sep->e_data4);
+                        ((struct n_entry *)sep)->e_vel,
+                        ((struct n_entry *)sep)->e_data4);
 
         printf("\n");

ram/showcfg.c

@@ -300 +300 @@
          0x1C00, 0x0E00, 0x0700, 0x0380,
          0x01C0, 0x00E0, 0x0070, 0x0038,
-         0x001C, 0x000E, 0x0007, 0x0003}
+         0x001C, 0x000E, 0x0007, 0x0003},
 
         {0x0000, 0x0000, 0x0000, 0x03C0,        /* 27 */
@@ -610 +610 @@
 */
 
+short
 imfnbox(n)
 short n;

ram/smscrl.c

@@ -236 +236 @@
 
         if (OldLine NE LineBuf)
-                v_odtab[ScrlObj][2] = ((char *)LineBuf >> 1) & 0xFFFF;
+                v_odtab[ScrlObj][2] = ((long)LineBuf >> 1) & 0xFFFF;
 
         OldLine = LineBuf;

ram/sqfield.c

@@ -64 +64 @@
 short   sqekey();               /* forward reference */
 short   sqmkey();               /* forward reference */
+short   sqdkey();               /* forward reference */
 
 /* 
@@ -104 +105 @@
 */
 
+short
 sqmkey()
 {
@@ -160 +162 @@
 */
 
+short
 sqekey()
 {
@@ -216 +219 @@
 */
 
+short
 sqxkey()
 {

ram/sqscan.c

@@ -352 +352 @@
                 tsp1->e_type  = EV_TRNS;
                 tsp1->e_data1 = curgrp;
-                (long)(tsp1->e_lft) = aux1;
+                tsp1->e_lft = (struct s_entry *)aux1;
 
                 p_cur = e_ins(tsp1, ep_adj(p_cur, 0, t_cur))->e_fwd;

ram/tdfield.c

@@ -261 +261 @@
 */
 
+short
 tdcyupd()
 {
@@ -295 +296 @@
 */
 
+short
 tdcxupd()
 {

ram/wdfield.c

@@ -419 +419 @@
 */
 
+short
 wdykdn()
 {
@@ -434 +435 @@
 */
 
+short
 wdykup()
 {
@@ -470 +472 @@
 */
 
+short
 wdcyupd()
 {
@@ -585 +588 @@
 */
 
+short
 wdcxupd()
 {

ram/wsdsp.c

@@ -389 +389 @@
 */
 
+short
 wdpoint(x, y, pen)
 short x, y, pen;