From: Alan Cox <alan@linux.intel.com>
Date: Fri, 13 Feb 2015 23:14:04 +0000 (+0000)
Subject: px4plus: clean up to current tree
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=3739f95353b409aa760f5f6e1db3392e4c9ada38;p=FUZIX.git

px4plus: clean up to current tree

This isn't a functional port yet - more a sanity checker on sizes
---

diff --git a/Kernel/platform-px4plus/config.h b/Kernel/platform-px4plus/config.h
index 2f8ffdcc..f8522b1f 100644
--- a/Kernel/platform-px4plus/config.h
+++ b/Kernel/platform-px4plus/config.h
@@ -31,18 +31,15 @@
 /* FIXME: the OVL timer isn't quite 100/sec and we have an accurate 1Hz
    timer available, so needs some tweaking */
 #define TICKSPERSEC 100   /* Ticks per second */
-#define PROGBASE    ((char *)(0x0000))  /* also data base */
-#define PROGLOAD    ((char *)(0x0100))
-#define PROGTOP     ((char *)(0x4000))  /* Top of program for debug */
+#define PROGBASE    0x0000  /* also data base */
+#define PROGLOAD    0x0100
+#define PROGTOP     0x4000  /* Top of program for debug */
 
 #define SWAP_SIZE   0x40 	/* 32K in blocks (with uarea means 31K max app size) */
-#define SWAPBASE    0x0100	/* We swap the lot in one, include the */
-#define SWAPTOP	    0x7C00	/* vectors so its a round number of sectors */
+#define SWAPBASE    0x0000	/* We swap the lot in one, include the */
+#define SWAPTOP	    0x8000	/* vectors so its a round number of sectors */
 #define MAX_SWAPS	4	/* We have a whopping 128K of RAMDISC! */
 
-#define UDATA_SWAPSIZE 0x0400	/* Write udata plus 0-0x0100 */
-#define UDATA_BLOCKS 2
-
 #define BOOT_TTY (512 + 1)/* Set this to default device for stdio, stderr */
                           /* In this case, the default is the first TTY device */
 
diff --git a/Kernel/platform-px4plus/devtty.c b/Kernel/platform-px4plus/devtty.c
index 2682250f..1e9e4553 100644
--- a/Kernel/platform-px4plus/devtty.c
+++ b/Kernel/platform-px4plus/devtty.c
@@ -24,7 +24,7 @@ void kputchar(char c)
 }
 
 /* It's the console display, always ready */
-static ttyready_t tty_writeready(uint8_t minor)
+ttyready_t tty_writeready(uint8_t minor)
 {
     minor;
     return TTY_READY_NOW;
diff --git a/Kernel/platform-px4plus/main.c b/Kernel/platform-px4plus/main.c
index 185dc2d6..f3632799 100644
--- a/Kernel/platform-px4plus/main.c
+++ b/Kernel/platform-px4plus/main.c
@@ -4,7 +4,7 @@
 #include <printf.h>
 #include <devtty.h>
 
-uint8_t *ramtop = PROGTOP;
+uint16_t ramtop = PROGTOP;
 
 /* On idle we spin checking for the terminals. Gives us more responsiveness
    for the polled ports */
@@ -31,12 +31,3 @@ void map_init(void)
 {
 }
 
-void *swapout_prepare_uarea(ptptr p)
-{
- return &udata;
-}
-
-void *swapin_prepare_uarea(ptptr p)
-{
- return &udata;
-}