Changeset 53 for trunk/hal/tsar_mips32/hal_ppm.c

Timestamp:

Jun 26, 2017, 4:22:00 PM (8 years ago)

Author:

alain

Message:

Compilation OK pout TSAR

File:

• trunk/hal/tsar_mips32/hal_ppm.c (modified) (6 diffs)

trunk/hal/tsar_mips32/hal_ppm.c

@@ -23 +23 @@
  */
 
+#include <kernel_config.h>
+#include <hal_types.h>
+#include <hal_ppm.h>
+#include <hal_special.h>
+#include <printk.h>
+#include <spinlock.h>
+#include <process.h>
+#include <ppm.h>
+#include <thread.h>
+#include <cluster.h>
+#include <page.h>
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -33 +44 @@
 
 
-//////////////////////////////////////////////////
-struct page_s * hal_ppm_init( boot_info_t * info )
+///////////////////////////////////////////
+error_t  hal_ppm_init( boot_info_t * info )
 {
+    uint32_t i;
+
     // get relevant info from boot_info structure
         uint32_t   pages_nr         = info->pages_nr;
@@ -54 +67 @@
 
     // initialize all free_pages[] lists as empty
-        ppm->total_free_pages = 0;
         for( i = 0 ; i < CONFIG_PPM_MAX_ORDER ; i++ )
         {
@@ -70 +82 @@
         ppm->pages_nr      = pages_nr;
     ppm->vaddr_base = NULL;
-        ppm->pages_tbl  = (page_t*)( vaddr_base + (pages_offset << CONFIG_PPM_PAGE_SHIFT) );
+        ppm->pages_tbl  = (page_t*)( ppm->vaddr_base + 
+                                 (pages_tbl_offset << CONFIG_PPM_PAGE_SHIFT) );
 
     // compute size of pages_tbl[] array rounded to an integer number of pages
@@ -79 +92 @@
 
     // compute total number of reserved pages (kernel code & pages_tbl[])
-        uint32_t reserved_pages = pages_offset + tbl_nb_pages;
+        uint32_t reserved_pages = pages_tbl_offset + pages_tbl_nr;
 
     // initialises all page descriptors in pages_tbl[]
@@ -106 +119 @@
 
     // check consistency
-    ppm_assert_order( ppm );
+    return ppm_assert_order( ppm );
 
-    // success
-    return ppm->pages_tbl;
+}  // end hal_ppm_init()
 
-}
-