Changeset 8c8b4e5 in buchla-68k for misc

Timestamp:

09/17/2017 05:01:10 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

432327d

Parents:

5c4721b

Message:

More volatile hardware accesses.

Location:

misc

Files:

• proto.c (modified) (6 diffs)
• proto.x (modified) (1 diff)

misc/proto.c

@@ -3 +3 @@
 int8_t                  ac_code;
 int16_t                 errno;
-int16_t                 timers[NTIMERS];
 int16_t                 fp_resv[];
 int8_t                  VerDate[];
-volatile uint16_t       vi_scrl;
-volatile uint16_t       vi_sadr;
+
+volatile        int16_t         timers[NTIMERS];
+volatile        uint16_t        vi_scrl;
+volatile        uint16_t        vi_sadr;
 
 int8_t                  end;
@@ -176 +177 @@
 }
 
-void tsplot4(uint16_t *obase, int16_t nw, int16_t fg, int16_t row, int16_t col, int8_t *str, int16_t pitch)
+void tsplot4(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t row, int16_t col, int8_t *str, int16_t pitch)
 {
 }
@@ -189 +190 @@
 }
 
-void vclrav(uint16_t *obase, int16_t row, int16_t col, uint16_t attr, int16_t len)
-{
-}
-
-void vcputs(uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str)
-{
-}
-
-void vcputsv(uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str, int16_t pitch)
+void vclrav(volatile uint16_t *obase, int16_t row, int16_t col, uint16_t attr, int16_t len)
+{
+}
+
+void vcputs(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str)
+{
+}
+
+void vcputsv(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str, int16_t pitch)
 {
 }
@@ -209 +210 @@
 }
 
-void vputa(uint16_t *obase, int16_t row, int16_t col, uint16_t attr)
-{
-}
-
-void vputc(uint16_t *obase, int16_t row, int16_t col, int16_t c, uint16_t attr)
-{
-}
-
-void vputcv(uint16_t *obase, int16_t row, int16_t col, int16_t c, uint16_t attr, int16_t cols)
+void vputa(volatile uint16_t *obase, int16_t row, int16_t col, uint16_t attr)
+{
+}
+
+void vputc(volatile uint16_t *obase, int16_t row, int16_t col, int16_t c, uint16_t attr)
+{
+}
+
+void vputcv(volatile uint16_t *obase, int16_t row, int16_t col, int16_t c, uint16_t attr, int16_t cols)
 {
 }
@@ -225 +226 @@
 }
 
-void vsetav(uint16_t *obase, int16_t row, int16_t col, uint16_t attr, int16_t len)
-{
-}
-
-void vsetcv(uint16_t *obase, int16_t row, int16_t col, uint16_t fgbg, int16_t len)
-{
-}
-
-void vsplot4(uint16_t *obase, int16_t nw, int16_t fg, int16_t row, int16_t col, int8_t *str,
-             int16_t pitch, int16_t ht, int16_t cgtab[][256])
-{
-}
-
-void vvputsv(uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col,
-             int8_t *str, int16_t pitch, int16_t ht, int16_t cgtab[][256])
+void vsetav(volatile uint16_t *obase, int16_t row, int16_t col, uint16_t attr, int16_t len)
+{
+}
+
+void vsetcv(volatile uint16_t *obase, int16_t row, int16_t col, uint16_t fgbg, int16_t len)
+{
+}
+
+void vsplot4(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t row, int16_t col, int8_t *str, int16_t pitch, int16_t ht, int16_t cgtab[][256])
+{
+}
+
+void vvputsv(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str, int16_t pitch, int16_t ht, int16_t cgtab[][256])
 {
 }
@@ -247 +246 @@
 }
 
-void vwputs(uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str)
+void vwputs(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str)
 {
 }

misc/proto.x

@@ -89 +89 @@
 extern  void            trap15(void);
 extern  void            tsetup(void);
-extern  void            tsplot4(uint16_t *obase, int16_t nw, int16_t fg, int16_t row, int16_t col, int8_t *str, int16_t pitch);
+extern  void            tsplot4(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t row, int16_t col, int8_t *str, int16_t pitch);
 extern  int32_t         uldiv(int32_t divid, int32_t divis);
 extern  void            vbank(int16_t b);
-extern  void            vclrav(uint16_t *obase, int16_t row, int16_t col, uint16_t attr, int16_t len);
-extern  void            vcputs(uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str);
-extern  void            vcputsv(uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str, int16_t pitch);
+extern  void            vclrav(volatile uint16_t *obase, int16_t row, int16_t col, uint16_t attr, int16_t len);
+extern  void            vcputs(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str);
+extern  void            vcputsv(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str, int16_t pitch);
 extern  void            vfwait(void);
-extern  void            vputa(uint16_t *obase, int16_t row, int16_t col, uint16_t attr);
-extern  void            vputc(uint16_t *obase, int16_t row, int16_t col, int16_t c, uint16_t attr);
-extern  void            vputcv(uint16_t *obase, int16_t row, int16_t col, int16_t c, uint16_t attr, int16_t cols);
+extern  void            vputa(volatile uint16_t *obase, int16_t row, int16_t col, uint16_t attr);
+extern  void            vputc(volatile uint16_t *obase, int16_t row, int16_t col, int16_t c, uint16_t attr);
+extern  void            vputcv(volatile uint16_t *obase, int16_t row, int16_t col, int16_t c, uint16_t attr, int16_t cols);
 extern  void            vputp(struct octent *octad, int16_t xloc, int16_t yloc, int16_t val);
-extern  void            vsetav(uint16_t *obase, int16_t row, int16_t col, uint16_t attr, int16_t len);
-extern  void            vsetcv(uint16_t *obase, int16_t row, int16_t col, uint16_t fgbg, int16_t len);
-extern  void            vsplot4(uint16_t *obase, int16_t nw, int16_t fg, int16_t row, int16_t col, int8_t *str, int16_t pitch, int16_t ht, int16_t cgtab[][256]);
-extern  void            vvputsv(uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str, int16_t pitch, int16_t ht, int16_t cgtab[][256]);
+extern  void            vsetav(volatile uint16_t *obase, int16_t row, int16_t col, uint16_t attr, int16_t len);
+extern  void            vsetcv(volatile uint16_t *obase, int16_t row, int16_t col, uint16_t fgbg, int16_t len);
+extern  void            vsplot4(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t row, int16_t col, int8_t *str, int16_t pitch, int16_t ht, int16_t cgtab[][256]);
+extern  void            vvputsv(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str, int16_t pitch, int16_t ht, int16_t cgtab[][256]);
 extern  void            vwputp(struct octent *octad, int16_t xloc, int16_t yloc, int16_t val);
-extern  void            vwputs(uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str);
+extern  void            vwputs(volatile uint16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str);
 extern  void            xtrap15(void);