Changeset 35a96cf in mainline

Timestamp:

2006-05-13T20:11:13Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6326f5e6

Parents:

2666daa

Message:

Sysinfo userspace interface

Files:

• arch/ia32/src/drivers/vesa.c (modified) (2 diffs)
• genarch/src/fb/fb.c (modified) (1 diff)
• generic/include/syscall/syscall.h (modified) (1 diff)
• generic/include/sysinfo/sysinfo.h (modified) (1 diff)
• generic/src/syscall/syscall.c (modified) (2 diffs)
• generic/src/sysinfo/sysinfo.c (modified) (2 diffs)

arch/ia32/src/drivers/vesa.c

@@ -42 +42 @@
 #include <memstr.h>
 #include <bitops.h>
+#include <sysinfo/sysinfo.h>
 
 __u32 vesa_ph_addr;
@@ -79 +80 @@
 
         fb_init(vram_lin_addr, vesa_width, vesa_height, vesa_bpp, vesa_scanline);
+        
+        sysinfo_set_item_val("Framebuffer.address.physical",NULL,vesa_ph_addr);
 }
 

genarch/src/fb/fb.c

@@ -366 +366 @@
         sysinfo_set_item_val("Framebuffer.scanline",NULL,scan);
         sysinfo_set_item_val("Framebuffer.bpp",NULL,bpp);
-        sysinfo_set_item_val("Framebuffer.address",NULL,addr);
-        
-
-
-}
+        sysinfo_set_item_val("Framebuffer.address.virtual",NULL,addr);
+        
+
+
+}

generic/include/syscall/syscall.h

@@ -59 +59 @@
         SYS_IOSPACE_ENABLE,
         SYS_PREEMPT_CONTROL,
+        SYS_SYSINFO_VALID,
+        SYS_SYSINFO_VALUE,
         SYSCALL_END
 } syscall_t;

generic/include/sysinfo/sysinfo.h

@@ -52 +52 @@
 sysinfo_rettype_t sysinfo_get_val(const char *name,sysinfo_item_t **root);
 
+__native sys_sysinfo_valid(__native ptr,__native len);
+__native sys_sysinfo_value(__native ptr,__native len);
+
+

generic/src/syscall/syscall.c

@@ -46 +46 @@
 #include <security/cap.h>
 #include <syscall/copy.h>
+#include <sysinfo/sysinfo.h>
 
 static __native sys_io(int fd, const void * buf, size_t count) {
@@ -109 +110 @@
         sys_physmem_map,
         sys_iospace_enable,
-        sys_preempt_control
+        sys_preempt_control,
+        
+        /* Sysinfo syscalls */
+        sys_sysinfo_valid,
+        sys_sysinfo_value
 };

generic/src/sysinfo/sysinfo.c

@@ -2 +2 @@
 #include <mm/slab.h>
 #include <print.h>
+#include <syscall/copy.h>
 
 sysinfo_item_t *_root=NULL;
@@ -221 +222 @@
         return ret;
 }
+
+__native sys_sysinfo_valid(__native ptr,__native len)
+{
+        char *str;
+        sysinfo_rettype_t ret;
+        str=malloc(len+1,0);
+        ASSERT(str);
+        copy_from_uspace(str,(void *)ptr,len+1);
+        if(str[len]) return 0;          /*This is not len lenght C string*/
+        ret=sysinfo_get_val(str,NULL);
+        free(str);
+        return ret.valid;
+}
+
+__native sys_sysinfo_value(__native ptr,__native len)
+{
+        char *str;
+        sysinfo_rettype_t ret;
+        str=malloc(len+1,0);
+        ASSERT(str);
+        copy_from_uspace(str,(void *)ptr,len+1);
+        if(str[len]) return 0;          /*This is not len lenght C string*/
+        ret=sysinfo_get_val(str,NULL);
+        free(str);
+        return ret.val;
+}
+
+