未使用の変数・関数宣言を削除

Author: Yuma Arakawa

kernel/include/shell_init.h

@@ -6,8 +6,4 @@
 #define SHELL_GDT_IDX	4
 #define SHELL_ID	1
 
-extern unsigned char shell_context_switch[CONTEXT_SWITCH_FN_SIZE];
-
-void shell_init(void);
-
 #endif /* _SHELL_INIT_H_ */

kernel/include/uptime_init.h

@@ -6,8 +6,4 @@
 #define UPTIME_GDT_IDX	5
 #define UPTIME_ID	2
 
-extern unsigned char uptime_context_switch[CONTEXT_SWITCH_FN_SIZE];
-
-void uptime_init(void);
-
 #endif /* _UPTIME_INIT_H_ */

kernel/main.c

@@ -86,8 +86,7 @@ static void task_init(unsigned short task_id,
 		      struct page_directory_entry *pd_base_addr,
 		      struct page_table_entry *pt_base_addr,
 		      unsigned int phys_binary_base,
-		      unsigned int phys_stack_base,
-		      void (*context_switch_fn)(void))
+		      unsigned int phys_stack_base)
 {
 	struct page_directory_entry *pde;
 	struct page_table_entry *pte;
@@ -206,11 +205,9 @@ int main(void)
 	/* Setup tasks */
 	kern_task_init();
 	task_init(SHELL_ID, (struct page_directory_entry *)0x00091000,
-		  (struct page_table_entry *)0x00092000, 0x00011000, 0x00070000,
-		  (void (*)(void))shell_context_switch);
+		  (struct page_table_entry *)0x00092000, 0x00011000, 0x00070000);
 	task_init(UPTIME_ID, (struct page_directory_entry *)0x00093000,
-		  (struct page_table_entry *)0x00094000, 0x00012000, 0x00071000,
-		  (void (*)(void))uptime_context_switch);
+		  (struct page_table_entry *)0x00094000, 0x00012000, 0x00071000);
 
 	/* Start paging */
 	mem_page_start();

kernel/shell_init.c

@@ -6,19 +6,3 @@
 
 #define APP_ENTRY_POINT	0x20000000
 #define APP_STACK_BASE	0x20002000
-
-/*
-00000000 <shell_context_switch>:
-   0:   55                      push   %ebp
-   1:   89 e5                   mov    %esp,%ebp
-   3:   ea 00 00 00 00 20 00    ljmp   $0x20,$0x0
-   a:   5d                      pop    %ebp
-   b:   c3                      ret
- */
-unsigned char shell_context_switch[CONTEXT_SWITCH_FN_SIZE] = {
-	0x55,
-	0x89, 0xe5,
-	0xea, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00,
-	0x5d,
-	0xc3
-};

kernel/uptime_init.c

@@ -6,19 +6,3 @@
 
 #define APP_ENTRY_POINT	0x20000000
 #define APP_STACK_BASE	0x20002000
-
-/*
-00000000 <uptime_context_switch>:
-   0:   55                      push   %ebp
-   1:   89 e5                   mov    %esp,%ebp
-   3:   ea 00 00 00 00 28 00    ljmp   $0x28,$0x0
-   a:   5d                      pop    %ebp
-   b:   c3                      ret
- */
-unsigned char uptime_context_switch[CONTEXT_SWITCH_FN_SIZE] = {
-	0x55,
-	0x89, 0xe5,
-	0xea, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00,
-	0x5d,
-	0xc3
-};