Changeset 00aece0 in mainline for kernel/arch/mips32/src/mips32.c
- Timestamp:
- 2012-02-18T16:47:38Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 4449c6c
- Parents:
- bd5f3b7 (diff), f943dd3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified kernel/arch/mips32/src/mips32.c ¶
rbd5f3b7 r00aece0 34 34 35 35 #include <arch.h> 36 #include <arch/cp0.h> 37 #include <arch/exception.h> 38 #include <arch/debug.h> 39 #include <mm/as.h> 36 #include <typedefs.h> 37 #include <errno.h> 38 #include <interrupt.h> 39 #include <macros.h> 40 #include <str.h> 41 #include <memstr.h> 40 42 #include <userspace.h> 41 #include <memstr.h>42 #include <proc/thread.h>43 #include <abi/proc/uarg.h>44 #include <print.h>45 43 #include <console/console.h> 46 44 #include <syscall/syscall.h> 47 45 #include <sysinfo/sysinfo.h> 48 #include <arch/interrupt.h> 49 #include <interrupt.h> 50 #include <console/chardev.h> 51 #include <arch/barrier.h> 46 #include <arch/debug.h> 52 47 #include <arch/debugger.h> 48 #include <arch/drivers/msim.h> 53 49 #include <genarch/fb/fb.h> 54 #include <abi/fb/visuals.h>55 50 #include <genarch/drivers/dsrln/dsrlnin.h> 56 51 #include <genarch/drivers/dsrln/dsrlnout.h> 57 52 #include <genarch/srln/srln.h> 58 #include <macros.h>59 #include <config.h>60 #include <str.h>61 #include <arch/drivers/msim.h>62 #include <arch/asm/regname.h>63 53 64 54 /* Size of the code jumping to the exception handler code … … 88 78 size_t i; 89 79 for (i = 0; i < init.cnt; i++) { 90 init.tasks[i]. addr = (uintptr_t) bootinfo->tasks[i].addr;80 init.tasks[i].paddr = KA2PA(bootinfo->tasks[i].addr); 91 81 init.tasks[i].size = bootinfo->tasks[i].size; 92 82 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN, … … 206 196 sysinfo_set_item_val("kbd", NULL, true); 207 197 sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ); 208 sysinfo_set_item_val("kbd.address.virtual", NULL, MSIM_KBD_ADDRESS); 198 sysinfo_set_item_val("kbd.address.physical", NULL, 199 PA2KA(MSIM_KBD_ADDRESS)); 209 200 #endif 210 201 } … … 248 239 * possible to have it separately in the future. 249 240 */ 250 sysarg_t sys_tls_set( sysarg_t addr)251 { 252 return 0;241 sysarg_t sys_tls_set(uintptr_t addr) 242 { 243 return EOK; 253 244 } 254 245
Note:
See TracChangeset
for help on using the changeset viewer.