amstradnc: align with uint_fast8_t and tty unsigned changes

diff --git a/Kernel/platform-amstradnc/devfd.c b/Kernel/platform-amstradnc/devfd.c
index 4072a68..86c2edc 100644 (file)
--- a/Kernel/platform-amstradnc/devfd.c
+++ b/Kernel/platform-amstradnc/devfd.c
@@ -7,7 +7,7 @@
 
 static timer_t spindown_timer = 0;
 
-int devfd_open(uint8_t minor, uint16_t flag)
+int devfd_open(uint_fast8_t minor, uint16_t flag)
 {
     flag;
     if(minor != 0) {
@@ -88,7 +88,7 @@ static void fd_select(int minor)
     nudge_timer();
 }
 
-static int devfd_transfer(bool is_read, uint8_t is_raw)
+static int devfd_transfer(bool is_read, uint_fast8_t is_raw)
 {
     int ct = 0;
     int tries;
@@ -146,13 +146,13 @@ static int devfd_transfer(bool is_read, uint8_t is_raw)
     return ct << BLKSHIFT;
 }
 
-int devfd_read(uint8_t minor, uint8_t is_raw, uint8_t flag)
+int devfd_read(uint_fast8_t minor, uint_fast8_t is_raw, uint_fast8_t flag)
 {
     flag;minor;
     return devfd_transfer(true, is_raw);
 }
 
-int devfd_write(uint8_t minor, uint8_t is_raw, uint8_t flag)
+int devfd_write(uint_fast8_t minor, uint_fast8_t is_raw, uint_fast8_t flag)
 {
     flag;minor;
     return devfd_transfer(false, is_raw);

diff --git a/Kernel/platform-amstradnc/devfd.h b/Kernel/platform-amstradnc/devfd.h
index 3f4ab84..0070735 100644 (file)
--- a/Kernel/platform-amstradnc/devfd.h
+++ b/Kernel/platform-amstradnc/devfd.h
@@ -2,9 +2,9 @@
 #define __DEVFD_DOT_H__
 
 /* public interface */
-int devfd_open(uint8_t minor, uint16_t flag);
-int devfd_read(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int devfd_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
+int devfd_open(uint_fast8_t minor, uint16_t flag);
+int devfd_read(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
+int devfd_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
 
 extern void devfd_spindown(void);
 

diff --git a/Kernel/platform-amstradnc/devgfx.c b/Kernel/platform-amstradnc/devgfx.c
index f273188..32694ff 100644 (file)
--- a/Kernel/platform-amstradnc/devgfx.c
+++ b/Kernel/platform-amstradnc/devgfx.c
@@ -34,7 +34,7 @@ static struct display ncdisplay = {
 };
 #endif
 
-int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr)
+int gfx_ioctl(uint_fast8_t minor, uarg_t arg, char *ptr)
 {
   uint8_t *tmp;
   uint16_t l;

diff --git a/Kernel/platform-amstradnc/devrd.c b/Kernel/platform-amstradnc/devrd.c
index fe7b36e..c7eaa3e 100644 (file)
--- a/Kernel/platform-amstradnc/devrd.c
+++ b/Kernel/platform-amstradnc/devrd.c
@@ -11,7 +11,7 @@
 /* Kernel page mapping */
 static const uint8_t kmap[] = { 0x83, 0x84, 0x85 };
 
-static int rd_transfer(bool is_read, uint8_t rawflag)
+static int rd_transfer(bool is_read, uint_fast8_t rawflag)
 {
     uint16_t dptr;
     int ct = 0;
@@ -45,7 +45,7 @@ static int rd_transfer(bool is_read, uint8_t rawflag)
     return ct << BLKSHIFT;
 }
 
-int rd_open(uint8_t minor, uint16_t flag)
+int rd_open(uint_fast8_t minor, uint16_t flag)
 {
     flag;
     if(minor != 0) {
@@ -55,13 +55,13 @@ int rd_open(uint8_t minor, uint16_t flag)
     return 0;
 }
 
-int rd_read(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int rd_read(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
     flag;minor;
     return rd_transfer(true, rawflag);
 }
 
-int rd_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int rd_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
     flag;minor;
     return rd_transfer(false, rawflag);

diff --git a/Kernel/platform-amstradnc/devrd.h b/Kernel/platform-amstradnc/devrd.h
index 0b8d49a..a36b64f 100644 (file)
--- a/Kernel/platform-amstradnc/devrd.h
+++ b/Kernel/platform-amstradnc/devrd.h
@@ -2,9 +2,9 @@
 #define __DEVRD_DOT_H__
 
 /* public interface */
-int rd_read(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int rd_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int rd_open(uint8_t minor, uint16_t flag);
+int rd_read(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
+int rd_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
+int rd_open(uint_fast8_t minor, uint16_t flag);
 
 /* asm banking helper */
 void rd_memcpy(uint8_t isread, uint8_t map, uint16_t dptr, uint16_t block,

diff --git a/Kernel/platform-amstradnc/devtty.c b/Kernel/platform-amstradnc/devtty.c
index 33dbe60..aaf643c 100644 (file)
--- a/Kernel/platform-amstradnc/devtty.c
+++ b/Kernel/platform-amstradnc/devtty.c
@@ -83,7 +83,7 @@ static void nap(void)
 
 /* tty1 is the screen tty2 is the serial port */
 
-int nc100_tty_open(uint8_t minor, uint16_t flag)
+int nc100_tty_open(uint_fast8_t minor, uint16_t flag)
 {
        int err;
        if (!minor)
@@ -107,7 +107,7 @@ int nc100_tty_open(uint8_t minor, uint16_t flag)
 }
 
 
-int nc100_tty_close(uint8_t minor)
+int nc100_tty_close(uint_fast8_t minor)
 {
        tty_close(minor);
        if (ttydata[minor].users)
@@ -124,7 +124,7 @@ int nc100_tty_close(uint8_t minor)
 }
 
 /* Output for the system console (kprintf etc) */
-void kputchar(char c)
+void kputchar(uint_fast8_t c)
 {
        if (c == '\n') {
                tty_putc(1, '\r');
@@ -134,7 +134,7 @@ void kputchar(char c)
        tty_putc(2, c);
 }
 
-ttyready_t tty_writeready(uint8_t minor)
+ttyready_t tty_writeready(uint_fast8_t minor)
 {
        uint8_t c;
        if (minor == 1)
@@ -143,7 +143,7 @@ ttyready_t tty_writeready(uint8_t minor)
        return (c & 1) ? TTY_READY_NOW : TTY_READY_SOON;
 }
 
-void tty_putc(uint8_t minor, unsigned char c)
+void tty_putc(uint_fast8_t minor, uint_fast8_t c)
 {
        minor;
        if (minor == 1) {
@@ -153,7 +153,7 @@ void tty_putc(uint8_t minor, unsigned char c)
        uarta = c;
 }
 
-void tty_data_consumed(uint8_t minor)
+void tty_data_consumed(uint_fast8_t minor)
 {
 }
 
@@ -162,7 +162,7 @@ void tty_data_consumed(uint8_t minor)
 static uint8_t uart_ctrl;
 
 /* Called to set baud rate etc */
-void tty_setup(uint8_t minor, uint8_t flags)
+void tty_setup(uint_fast8_t minor, uint_fast8_t flags)
 {
        uint8_t b;
        if (minor == 1)
@@ -198,13 +198,13 @@ void tty_setup(uint8_t minor, uint8_t flags)
 }
 
 /* The NC100 and NC200 don't have a carrier input on the connector */
-int tty_carrier(uint8_t minor)
+int tty_carrier(uint_fast8_t minor)
 {
     minor;
     return 1;
 }
 
-void tty_sleeping(uint8_t minor)
+void tty_sleeping(uint_fast8_t minor)
 {
     txwait = 1;
 }

diff --git a/Kernel/platform-amstradnc/m146818.c b/Kernel/platform-amstradnc/m146818.c
index 95a2bfa..99e1ca6 100644 (file)
--- a/Kernel/platform-amstradnc/m146818.c
+++ b/Kernel/platform-amstradnc/m146818.c
@@ -18,7 +18,7 @@ __sfr __at 0xD8 rtc_month;
 __sfr __at 0xD9 rtc_year;
 __sfr __at 0xDA rtc_rega;
 
-uint8_t platform_rtc_secs(void) __naked
+uint_fast8_t platform_rtc_secs(void)
 {
         static uint8_t last;
         if (rtc_rega & 0x80)

diff --git a/Kernel/platform-amstradnc/tc8521.c b/Kernel/platform-amstradnc/tc8521.c
index bfcd961..83dde17 100644 (file)
--- a/Kernel/platform-amstradnc/tc8521.c
+++ b/Kernel/platform-amstradnc/tc8521.c
@@ -56,7 +56,7 @@ l1:     ini           ; high bits of field in low bits of (hl)
 }
 
 
-uint8_t platform_rtc_secs(void) __naked
+uint8_fast_t platform_rtc_secs(void) __naked
 {
     __asm
         in a, (CLOCK_PORT)