dragon-nx32: initial type resync

diff --git a/Kernel/platform-dragon-nx32/devfd.c b/Kernel/platform-dragon-nx32/devfd.c
index b4cbdfb..e8c1884 100644 (file)
--- a/Kernel/platform-dragon-nx32/devfd.c
+++ b/Kernel/platform-dragon-nx32/devfd.c
@@ -51,7 +51,7 @@ void fd_timer_tick(void)
 /* static uint8_t selmap[4] = { 0x01, 0x02, 0x04, 0x40 }; - COCO */
 static uint8_t selmap[4] = {0x00, 0x01, 0x02, 0x03 };
 
-static int fd_transfer(uint8_t minor, bool is_read, uint8_t rawflag)
+static int fd_transfer(uint_fast8_t minor, bool is_read, uint_fast8_t rawflag)
 {
     int tries;
     int count = 0;
@@ -113,7 +113,7 @@ bad2:
 
 }
 
-int fd_open(uint8_t minor, uint16_t flag)
+int fd_open(uint_fast8_t minor, uint16_t flag)
 {
     if(minor >= MAX_FD) {
         udata.u_error = ENODEV;
@@ -122,12 +122,12 @@ int fd_open(uint8_t minor, uint16_t flag)
     return 0;
 }
 
-int fd_read(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int fd_read(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
     return fd_transfer(minor, true, rawflag);
 }
 
-int fd_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int fd_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
     return fd_transfer(minor, false, rawflag);
 }

diff --git a/Kernel/platform-dragon-nx32/devfd.h b/Kernel/platform-dragon-nx32/devfd.h
index b2754e6..bb75158 100644 (file)
--- a/Kernel/platform-dragon-nx32/devfd.h
+++ b/Kernel/platform-dragon-nx32/devfd.h
@@ -2,9 +2,9 @@
 #define __DEVFD_DOT_H__
 
 /* public interface */
-int fd_read(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int fd_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int fd_open(uint8_t minor, uint16_t flag);
+int fd_read(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
+int fd_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
+int fd_open(uint_fast8_t minor, uint16_t flag);
 void fd_timer_tick(void);
 
 /* low level interface */

diff --git a/Kernel/platform-dragon-nx32/devlpr.c b/Kernel/platform-dragon-nx32/devlpr.c
index 9c62b18..97408bd 100644 (file)
--- a/Kernel/platform-dragon-nx32/devlpr.c
+++ b/Kernel/platform-dragon-nx32/devlpr.c
@@ -8,7 +8,7 @@ volatile uint8_t * const pia0b = (uint8_t *)0xFF02;
 volatile uint8_t * const pia1a = (uint8_t *)0xFF20;
 volatile uint8_t * const pia1b = (uint8_t *)0xFF22;
 
-int lpr_open(uint8_t minor, uint16_t flag)
+int lpr_open(uint_fast8_t minor, uint16_t flag)
 {
        if (minor < 2)
                return 0;
@@ -16,7 +16,7 @@ int lpr_open(uint8_t minor, uint16_t flag)
        return -1;
 }
 
-int lpr_close(uint8_t minor)
+int lpr_close(uint_fast8_t minor)
 {
        if (minor == 1)
                dw_lpr_close();
@@ -37,7 +37,7 @@ static int iopoll(int sofar)
        return 0;
 }
 
-int lpr_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int lpr_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
        uint8_t *p = udata.u_base;
        uint8_t *pe = p + udata.u_count;

diff --git a/Kernel/platform-dragon-nx32/devlpr.h b/Kernel/platform-dragon-nx32/devlpr.h
index 0e078ca..f5409fb 100644 (file)
--- a/Kernel/platform-dragon-nx32/devlpr.h
+++ b/Kernel/platform-dragon-nx32/devlpr.h
@@ -1,9 +1,9 @@
 #ifndef __DEVLPR_DOT_H__
 #define __DEVLPR_DOT_H__
 
-extern int lpr_open(uint8_t minor, uint16_t flag);
-extern int lpr_close(uint8_t minor);
-extern int lpr_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
+extern int lpr_open(uint_fast8_t minor, uint16_t flag);
+extern int lpr_close(uint_fast8_t minor);
+extern int lpr_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
 
 extern void dw_lpr(uint8_t c);
 extern void dw_lpr_close(void);

diff --git a/Kernel/platform-dragon-nx32/devtty.c b/Kernel/platform-dragon-nx32/devtty.c
index fe0a28b..0eb8e9c 100644 (file)
--- a/Kernel/platform-dragon-nx32/devtty.c
+++ b/Kernel/platform-dragon-nx32/devtty.c
@@ -91,14 +91,14 @@ struct vt_repeat keyrepeat = { 40, 4 };
 /* tty1 is the screen tty2 is the serial port */
 
 /* Output for the system console (kprintf etc) */
-void kputchar(char c)
+void kputchar(uint_fast8_t c)
 {
        if (c == '\n')
                tty_putc(TTYDEV & 0xff, '\r');
        tty_putc(TTYDEV & 0xff, c);
 }
 
-ttyready_t tty_writeready(uint8_t minor)
+ttyready_t tty_writeready(uint_fast8_t minor)
 {
        uint8_t c = 0xff;
        if (minor == 1)
@@ -112,7 +112,7 @@ ttyready_t tty_writeready(uint8_t minor)
 
 /* For DragonPlus we should perhaps support both monitors 8) */
 
-void tty_putc(uint8_t minor, unsigned char c)
+void tty_putc(uint_fast8_t minor, uint_fast8_t c)
 {
        irqflags_t irq;
 
@@ -139,7 +139,7 @@ void tty_putc(uint8_t minor, unsigned char c)
        irqrestore(irq);
 }
 
-void tty_sleeping(uint8_t minor)
+void tty_sleeping(uint_fast8_t minor)
 {
     used(minor);
 }
@@ -168,7 +168,7 @@ static uint8_t bitbits[] = {
        0x00
 };
 
-void tty_setup(uint8_t minor, uint8_t flag)
+void tty_setup(uint_fast8_t minor, uint_fast8_t flag)
 {
        uint8_t r;
        if (is_dw(minor)) {
@@ -204,14 +204,14 @@ void tty_setup(uint8_t minor, uint8_t flag)
        }
 }
 
-int tty_carrier(uint8_t minor)
+int tty_carrier(uint_fast8_t minor)
 {
        if (is_dw(minor)) return dw_carrier( minor );
        /* The serial DCD is status bit 5 but not wired */
        return 1;
 }
 
-void tty_data_consumed(uint8_t minor)
+void tty_data_consumed(uint_fast8_t minor)
 {
 }
 
@@ -474,7 +474,7 @@ static int gfx_draw_op(uarg_t arg, char *ptr, uint8_t *buf)
   return 0;
 }
 
-int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr)
+int gfx_ioctl(uint_fast8_t minor, uarg_t arg, char *ptr)
 {
        extern unsigned char fontdata_8x8[];
 
@@ -555,7 +555,7 @@ int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr)
 }
 
 /* A wrapper for tty_close that closes the DW port properly */
-int my_tty_close(uint8_t minor)
+int my_tty_close(uint_fast8_t minor)
 {
        if (is_dw(minor) && ttydata[minor].users == 1)
                dw_vclose(minor);

diff --git a/Kernel/platform-dragon-nx32/devtty.h b/Kernel/platform-dragon-nx32/devtty.h
index d28406a..25cc600 100644 (file)
--- a/Kernel/platform-dragon-nx32/devtty.h
+++ b/Kernel/platform-dragon-nx32/devtty.h
@@ -12,11 +12,11 @@ extern const signed char vt_tbottom[4];
 extern uint8_t curtty;
 extern void vc_clear(int8_t vc_num);
 
-extern int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr);
+extern int gfx_ioctl(uint_fast8_t minor, uarg_t arg, char *ptr);
 
 extern void video_cmd(uint8_t *ptr);
 extern void video_read(uint8_t *ptr);
 extern void video_write(uint8_t *ptr);
 
-int my_tty_close( uint8_t minor ); /* wrapper call to close DW ports */
+int my_tty_close( uint_fast8_t minor ); /* wrapper call to close DW ports */
 #endif