swap: Make various methods global ready for further movements

diff --git a/Kernel/include/kernel.h b/Kernel/include/kernel.h
index 1dd482f..6b9b24a 100644 (file)
--- a/Kernel/include/kernel.h
+++ b/Kernel/include/kernel.h
@@ -737,9 +737,16 @@ extern uint8_t *swapbase;
 extern unsigned int swapcnt;
 extern blkno_t swapblk;
 
+extern int swapread(uint16_t dev, blkno_t blkno, unsigned int nbytes,
+                    uint8_t *buf);
+extern int swapwrite(uint16_t dev, blkno_t blkno, unsigned int nbytes,
+                    uint8_t *buf);
+
 extern void swapmap_add(uint8_t swap);
 extern ptptr swapneeded(ptptr p, int selfok);
 extern void swapper(ptptr p);
+extern int swapout(ptptr p);
+extern void swapin(ptptr p);
 
 /* syscalls_fs.c, syscalls_proc.c, syscall_other.c etc */
 extern void updoff(void);
@@ -763,8 +770,6 @@ extern void pagemap_free(ptptr p);
 extern int pagemap_alloc(ptptr p);
 extern int pagemap_realloc(usize_t p);
 extern uaddr_t pagemap_mem_used(void);
-extern uint8_t *swapout_prepare_uarea(ptptr p);
-extern uint8_t *swapin_prepare_uarea(ptptr p);
 extern void map_init(void);
 extern void platform_idle(void);
 extern uint8_t rtc_secs(void);

diff --git a/Kernel/swap.c b/Kernel/swap.c
index d8cf7af..9b6eaef 100644 (file)
--- a/Kernel/swap.c
+++ b/Kernel/swap.c
@@ -31,7 +31,7 @@ void swapmap_add(uint8_t swap)
        swapmap[swapptr++] = swap;
 }
 
-static int swapread(uint16_t dev, blkno_t blkno, unsigned int nbytes,
+int swapread(uint16_t dev, blkno_t blkno, unsigned int nbytes,
                     uint8_t *buf)
 {
        swapbase = buf;
@@ -41,7 +41,7 @@ static int swapread(uint16_t dev, blkno_t blkno, unsigned int nbytes,
 }
 
 
-static int swapwrite(uint16_t dev, blkno_t blkno, unsigned int nbytes,
+int swapwrite(uint16_t dev, blkno_t blkno, unsigned int nbytes,
                     uint8_t *buf)
 {
        swapbase = buf;
@@ -92,7 +92,7 @@ int swapout(ptptr p)
 /*
  * Swap ourself in: must be on the swap stack when we do this
  */
-static void swapin(ptptr p)
+void swapin(ptptr p)
 {
        uint16_t blk = p->p_page2 * SWAP_SIZE;