Changeset 8565a42 in mainline for kernel/arch/ia64/src/ia64.c
- Timestamp:
- 2018-03-02T20:34:50Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a1a81f69, d5e5fd1
- Parents:
- 3061bc1 (diff), 34e1206 (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. - git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
- git-committer:
- GitHub <noreply@…> (2018-03-02 20:34:50)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/ia64/src/ia64.c
r3061bc1 r8565a42 108 108 PAGE_WRITE | PAGE_NOT_CACHEABLE); 109 109 int i; 110 110 111 111 int myid, myeid; 112 112 113 113 myid = ia64_get_cpu_id(); 114 114 myeid = ia64_get_cpu_eid(); … … 167 167 } 168 168 } 169 169 170 170 outdev_t *skidev = skiout_init(); 171 171 if (skidev) 172 172 stdout_wire(skidev); 173 173 #endif 174 174 175 175 #ifdef CONFIG_EGA 176 176 outdev_t *egadev = ega_init(EGA_BASE, EGA_VIDEORAM); … … 178 178 stdout_wire(egadev); 179 179 #endif 180 180 181 181 #ifdef CONFIG_NS16550 182 182 ns16550_instance_t *ns16550_instance … … 191 191 } 192 192 } 193 193 194 194 sysinfo_set_item_val("kbd", NULL, true); 195 195 sysinfo_set_item_val("kbd.inr", NULL, NS16550_IRQ); … … 198 198 (uintptr_t) NS16550_BASE); 199 199 #endif 200 200 201 201 #ifdef CONFIG_I8042 202 202 i8042_instance_t *i8042_instance = i8042_init((i8042_t *) I8042_BASE, … … 211 211 } 212 212 #endif 213 213 214 214 sysinfo_set_item_val("ia64_iospace", NULL, true); 215 215 sysinfo_set_item_val("ia64_iospace.address", NULL, true); … … 251 251 kernel_uarg->uspace_stack_size / 2, 252 252 (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value); 253 253 254 254 while (1); 255 255 } … … 274 274 fptr->fnc = (sysarg_t) addr; 275 275 fptr->gp = ((sysarg_t *) caller)[1]; 276 276 277 277 return (void *) fptr; 278 278 }
Note:
See TracChangeset
for help on using the changeset viewer.