Changeset 431 for trunk

Timestamp:

Jan 29, 2018, 6:24:50 PM (7 years ago)

Author:

alain

Message:

OK

Location:

trunk

Files:

• Makefile.tsar (modified) (4 diffs)
• hdd/virt_hdd.dmg (deleted)
• kernel_config.h (modified) (3 diffs)

trunk/Makefile.tsar

@@ -183 +183 @@
               build/kernel/syscalls/sys_exec.o            \
               build/kernel/syscalls/sys_stat.o            \
-              build/kernel/syscalls/sys_trace.o
+              build/kernel/syscalls/sys_wait.o 
 
 SYS_OBJS_4  = build/kernel/syscalls/sys_get_config.o      \
               build/kernel/syscalls/sys_get_core.o        \
               build/kernel/syscalls/sys_get_cycle.o       \
-              build/kernel/syscalls/sys_get_sched.o       \
-              build/kernel/syscalls/sys_panic.o           \
+              build/kernel/syscalls/sys_display.o         \
               build/kernel/syscalls/sys_thread_sleep.o    \
-              build/kernel/syscalls/sys_thread_wakeup.o 
+              build/kernel/syscalls/sys_thread_wakeup.o   \
+              build/kernel/syscalls/sys_trace.o           \
+              build/kernel/syscalls/sys_fg.o 
 
 VFS_OBJS    = build/kernel/fs/vfs.o              \
@@ -233 +234 @@
                  build/boot/boot.elf      \
          build/kernel/kernel.elf  \
+         build/user/init/init.elf \
          build/user/ksh/ksh.elf   \
          build/user/sort/sort.elf \
@@ -272 +274 @@
         rm -f hard_config.h arch_info.xml arch_info.bin
         rm -rf build
-        cd user/ksh  &&  $(MAKE) clean  &&  cd ../..
+        cd user/init  &&  $(MAKE) clean  &&  cd ../..
+        cd user/ksh   &&  $(MAKE) clean  &&  cd ../..
         cd user/sort  &&  $(MAKE) clean  &&  cd ../..
         cd user/pgcd  &&  $(MAKE) clean  &&  cd ../..
@@ -503 +506 @@
 # Rules to generate various user .elf and copy on virtual disk
 
+build/user/init/init.elf : user/init/init.c 
+        $(MAKE) -C user/init 
+        mcopy -o -i $(DISK_IMAGE) user/init/init.elf ::/bin/user 
+  
 build/user/ksh/ksh.elf : user/ksh/ksh.c 
         $(MAKE) -C user/ksh 

trunk/kernel_config.h

@@ -124 +124 @@
 #define CONFIG_PROCESS_HEAP_MIN_SIZE        0x00010000 // user heap min size (bytes)
 #define CONFIG_PROCESS_HEAP_MAX_SIZE        0x30000000 // user heap max size (bytes)
-#define CONFIG_PROCESS_INIT_PATH            "/bin/user/ksh.elf"
+#define CONFIG_PROCESS_INIT_PATH            "/bin/user/init.elf"
 
 ////////////////////////////////////////////////////////////////////////////////////////////
@@ -161 +161 @@
 ////////////////////////////////////////////////////////////////////////////////////////////
 
-#define CONFIG_SCHED_TICK_MS_PERIOD         1000    // number of milliseconds
+#define CONFIG_SCHED_TICK_MS_PERIOD         5000    // number of milliseconds per period
 #define CONFIG_SCHED_TICKS_PER_QUANTUM      1       // number of ticks between scheduling
 #define CONFIG_SCHED_MAX_THREADS_NR         32      // max number of threads per core
@@ -183 +183 @@
 #define CONFIG_RPC_PENDING_MAX              8      // max requests handled by one server 
 #define CONFIG_RPC_THREADS_MAX              8      // max number of RPC threads per core
-
-////////////////////////////////////////////////////////////////////////////////////////////
-//                     PROCESS INIT & PROCESS USER TERMINALS
-////////////////////////////////////////////////////////////////////////////////////////////
-
-#define CONFIG_INIT_STDIN                    "/dev/external/txt1_rx"
-#define CONFIG_INIT_STDOUT                   "/dev/external/txt1_tx"
-#define CONFIG_INIT_STDERR                   "/dev/external/txt1_tx"
-
-#define CONFIG_USER_STDIN                    "/dev/external/txt2_rx"
-#define CONFIG_USER_STDOUT                   "/dev/external/txt2_tx"
-#define CONFIG_USER_STDERR                   "/dev/external/txt2_tx"
 
 ////////////////////////////////////////////////////////////////////////////////////////////