devices: Fix an off by one error in the maximum device checks

If we have 1 major then the highest permitted device is 0,255 not 1, 255.

This only ever showed up if you either mknod a device once bigger than that
supported or attempt to boot a device one higher than the limit.

diff --git a/Kernel/platform-68hc11test/devices.c b/Kernel/platform-68hc11test/devices.c
index df1dcdd..6c15d6e 100644 (file)
--- a/Kernel/platform-68hc11test/devices.c
+++ b/Kernel/platform-68hc11test/devices.c
@@ -27,7 +27,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-atarist/devices.c b/Kernel/platform-atarist/devices.c
index fe99fe2..50f0f27 100644 (file)
--- a/Kernel/platform-atarist/devices.c
+++ b/Kernel/platform-atarist/devices.c
@@ -28,7 +28,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-coco2/devices.c b/Kernel/platform-coco2/devices.c
index 5c3689b..f62ec4a 100644 (file)
--- a/Kernel/platform-coco2/devices.c
+++ b/Kernel/platform-coco2/devices.c
@@ -37,7 +37,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-coco2cart/devices.c b/Kernel/platform-coco2cart/devices.c
index 3bcb457..d0c5488 100644 (file)
--- a/Kernel/platform-coco2cart/devices.c
+++ b/Kernel/platform-coco2cart/devices.c
@@ -39,7 +39,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-coco3/devices.c b/Kernel/platform-coco3/devices.c
index 79445ca..27c6c4a 100644 (file)
--- a/Kernel/platform-coco3/devices.c
+++ b/Kernel/platform-coco3/devices.c
@@ -38,7 +38,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-  if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+  if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
     return false;
   else
     return true;

diff --git a/Kernel/platform-dragon-nx32/devices.c b/Kernel/platform-dragon-nx32/devices.c
index 4b37f75..afa4c6c 100644 (file)
--- a/Kernel/platform-dragon-nx32/devices.c
+++ b/Kernel/platform-dragon-nx32/devices.c
@@ -42,7 +42,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-dragon/devices.c b/Kernel/platform-dragon/devices.c
index a188243..960fbcb 100644 (file)
--- a/Kernel/platform-dragon/devices.c
+++ b/Kernel/platform-dragon/devices.c
@@ -34,7 +34,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-micropack/devices.c b/Kernel/platform-micropack/devices.c
index c16f208..2bdf907 100644 (file)
--- a/Kernel/platform-micropack/devices.c
+++ b/Kernel/platform-micropack/devices.c
@@ -28,7 +28,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-msp430fr5969/devices.c b/Kernel/platform-msp430fr5969/devices.c
index 4543283..e61ca41 100644 (file)
--- a/Kernel/platform-msp430fr5969/devices.c
+++ b/Kernel/platform-msp430fr5969/devices.c
@@ -33,7 +33,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-msx1/devices.c b/Kernel/platform-msx1/devices.c
index d8e373a..25ffd32 100644 (file)
--- a/Kernel/platform-msx1/devices.c
+++ b/Kernel/platform-msx1/devices.c
@@ -29,7 +29,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-msx2/devices.c b/Kernel/platform-msx2/devices.c
index 7a19fe6..b4658c0 100644 (file)
--- a/Kernel/platform-msx2/devices.c
+++ b/Kernel/platform-msx2/devices.c
@@ -32,7 +32,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
         return false;
     else
         return true;

diff --git a/Kernel/platform-mtx/devices.c b/Kernel/platform-mtx/devices.c
index edddf36..937c665 100644 (file)
--- a/Kernel/platform-mtx/devices.c
+++ b/Kernel/platform-mtx/devices.c
@@ -35,7 +35,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-multicomp09/devices.c b/Kernel/platform-multicomp09/devices.c
index ad72e3d..a3073d6 100644 (file)
--- a/Kernel/platform-multicomp09/devices.c
+++ b/Kernel/platform-multicomp09/devices.c
@@ -41,7 +41,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-  if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+  if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
     return false;
   else
     return true;

diff --git a/Kernel/platform-n8vem-mark4/devices.c b/Kernel/platform-n8vem-mark4/devices.c
index ca43cee..0e6ad7f 100644 (file)
--- a/Kernel/platform-n8vem-mark4/devices.c
+++ b/Kernel/platform-n8vem-mark4/devices.c
@@ -24,7 +24,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
         return false;
     else
         return true;

diff --git a/Kernel/platform-nc100/devices.c b/Kernel/platform-nc100/devices.c
index 6fb58e2..887b350 100644 (file)
--- a/Kernel/platform-nc100/devices.c
+++ b/Kernel/platform-nc100/devices.c
@@ -28,7 +28,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-p112/devices.c b/Kernel/platform-p112/devices.c
index a4d2250..c70ee3f 100644 (file)
--- a/Kernel/platform-p112/devices.c
+++ b/Kernel/platform-p112/devices.c
@@ -30,7 +30,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-pcw8256/devices.c b/Kernel/platform-pcw8256/devices.c
index 8058595..07dacde 100644 (file)
--- a/Kernel/platform-pcw8256/devices.c
+++ b/Kernel/platform-pcw8256/devices.c
@@ -29,7 +29,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-pdp11/devices.c b/Kernel/platform-pdp11/devices.c
index 7abcab5..3e98824 100644 (file)
--- a/Kernel/platform-pdp11/devices.c
+++ b/Kernel/platform-pdp11/devices.c
@@ -26,7 +26,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-plus3/devices.c b/Kernel/platform-plus3/devices.c
index 51e43f3..568fe2a 100644 (file)
--- a/Kernel/platform-plus3/devices.c
+++ b/Kernel/platform-plus3/devices.c
@@ -30,7 +30,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-px4plus/devices.c b/Kernel/platform-px4plus/devices.c
index fbd7369..a6fd8a3 100644 (file)
--- a/Kernel/platform-px4plus/devices.c
+++ b/Kernel/platform-px4plus/devices.c
@@ -29,7 +29,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-socz80/devices.c b/Kernel/platform-socz80/devices.c
index cdf1ef8..2366f0c 100644 (file)
--- a/Kernel/platform-socz80/devices.c
+++ b/Kernel/platform-socz80/devices.c
@@ -36,7 +36,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-tgl6502/devices.c b/Kernel/platform-tgl6502/devices.c
index 614690b..994f5f9 100644 (file)
--- a/Kernel/platform-tgl6502/devices.c
+++ b/Kernel/platform-tgl6502/devices.c
@@ -27,7 +27,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-trs80/devices.c b/Kernel/platform-trs80/devices.c
index 1b80402..3c71885 100644 (file)
--- a/Kernel/platform-trs80/devices.c
+++ b/Kernel/platform-trs80/devices.c
@@ -35,7 +35,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-ubee/devices.c b/Kernel/platform-ubee/devices.c
index 7d4f7ca..50f3069 100644 (file)
--- a/Kernel/platform-ubee/devices.c
+++ b/Kernel/platform-ubee/devices.c
@@ -27,7 +27,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-v65/devices.c b/Kernel/platform-v65/devices.c
index fe94a0b..8f2563d 100644 (file)
--- a/Kernel/platform-v65/devices.c
+++ b/Kernel/platform-v65/devices.c
@@ -27,7 +27,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-v68-banked/devices.c b/Kernel/platform-v68-banked/devices.c
index 3c1bef5..623668c 100644 (file)
--- a/Kernel/platform-v68-banked/devices.c
+++ b/Kernel/platform-v68-banked/devices.c
@@ -28,7 +28,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-v68-softmmu/devices.c b/Kernel/platform-v68-softmmu/devices.c
index 5c79733..42e7187 100644 (file)
--- a/Kernel/platform-v68-softmmu/devices.c
+++ b/Kernel/platform-v68-softmmu/devices.c
@@ -28,7 +28,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-v68/devices.c b/Kernel/platform-v68/devices.c
index 3c1bef5..623668c 100644 (file)
--- a/Kernel/platform-v68/devices.c
+++ b/Kernel/platform-v68/devices.c
@@ -28,7 +28,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-z80pack-lite/devices.c b/Kernel/platform-z80pack-lite/devices.c
index d67f11a..759b4c1 100644 (file)
--- a/Kernel/platform-z80pack-lite/devices.c
+++ b/Kernel/platform-z80pack-lite/devices.c
@@ -29,7 +29,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-z80pack/devices.c b/Kernel/platform-z80pack/devices.c
index fb8b563..9d3c0ed 100644 (file)
--- a/Kernel/platform-z80pack/devices.c
+++ b/Kernel/platform-z80pack/devices.c
@@ -30,7 +30,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-z80pack32/devices.c b/Kernel/platform-z80pack32/devices.c
index c60640f..31151c6 100644 (file)
--- a/Kernel/platform-z80pack32/devices.c
+++ b/Kernel/platform-z80pack32/devices.c
@@ -28,7 +28,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;

diff --git a/Kernel/platform-zeta-v2/devices.c b/Kernel/platform-zeta-v2/devices.c
index 63bbb7d..322c8af 100644 (file)
--- a/Kernel/platform-zeta-v2/devices.c
+++ b/Kernel/platform-zeta-v2/devices.c
@@ -40,7 +40,7 @@ bool validdev(uint16_t dev)
 {
        /* This is a bit uglier than needed but the right hand side is
         a constant this way */
-       if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+       if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
                return false;
        else
                return true;

diff --git a/Kernel/platform-zx128/devices.c b/Kernel/platform-zx128/devices.c
index b8abe9b..9b31225 100644 (file)
--- a/Kernel/platform-zx128/devices.c
+++ b/Kernel/platform-zx128/devices.c
@@ -43,7 +43,7 @@ bool validdev(uint16_t dev)
 {
     /* This is a bit uglier than needed but the right hand side is
        a constant this way */
-    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) + 255)
+    if(dev > ((sizeof(dev_tab)/sizeof(struct devsw)) << 8) - 1)
        return false;
     else
         return true;