px4plus: realign in progress port

diff --git a/Kernel/platform-px4plus/config.h b/Kernel/platform-px4plus/config.h
index b47a99f..99e56ab 100644 (file)
--- a/Kernel/platform-px4plus/config.h
+++ b/Kernel/platform-px4plus/config.h
@@ -34,8 +34,8 @@
 /* FIXME: treat the banks of the ramdisc as memory not swap, also trim
    to 30K as only have 120K of RAMdisc */
 #define SWAP_SIZE   0x40       /* 32K in blocks (with uarea means 31.25K max app size) */
-#define SWAPBASE    (uint8_t *)0x5D00  /* We swap the lot in one, include the */
-#define SWAPTOP            (uint8_t *)0xDD00   /* vectors so its a round number of sectors */
+#define SWAPBASE    0x5D00     /* We swap the lot in one, include the */
+#define SWAPTOP            0xDD00      /* vectors so its a round number of sectors */
 #define MAX_SWAPS      4       /* We have a whopping 128K of RAMDISC! */
 
 #define BOOT_TTY (512 + 1)/* Set this to default device for stdio, stderr */
@@ -57,4 +57,6 @@
 #define VT_RIGHT       29
 #define VT_BOTTOM      7
 
+#define swap_map(x)    ((uint8_t *)(x))
+
 #define platform_discard()

diff --git a/Kernel/platform-px4plus/devfd.c b/Kernel/platform-px4plus/devfd.c
index 871a745..01ef35b 100644 (file)
--- a/Kernel/platform-px4plus/devfd.c
+++ b/Kernel/platform-px4plus/devfd.c
@@ -68,7 +68,7 @@ int fd_transfer(uint8_t minor, bool is_read, uint8_t rawflag)
     } else if (rawflag == 2) {
        nblock = swapcnt >> 7;  /* in 128 byte chunks */
        dptr = (uint16_t)swapbase;
-       page = swapproc->p_page;
+       page = swappage;
        block = swapblk << 2;
     } else
        goto bad;

diff --git a/Kernel/platform-px4plus/px4plus.s b/Kernel/platform-px4plus/px4plus.s
index d2030a3..fa679ae 100644 (file)
--- a/Kernel/platform-px4plus/px4plus.s
+++ b/Kernel/platform-px4plus/px4plus.s
@@ -16,9 +16,9 @@
            .globl map_restore
            .globl map_process_save
            .globl map_kernel_restore
-           .globl _kernel_flag
            .globl _sidecar
            .globl _carttype
+           .globl _need_resched
 
            .globl platform_interrupt_all