Changes in / [103db908:04c35fca] in mainline
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/ia64/src/drivers/ski.c
r103db908 r04c35fca 37 37 #include <console/console.h> 38 38 #include <console/chardev.h> 39 #include <ddi/ddi.h> 39 40 #include <sysinfo/sysinfo.h> 40 41 #include <stdint.h> … … 69 70 70 71 static ski_instance_t *instance = NULL; 72 static parea_t ski_parea; 71 73 72 74 /** Ask debug console if a key was pressed. … … 105 107 int count = POLL_LIMIT; 106 108 109 if (ski_parea.mapped) 110 return; 111 107 112 while (count > 0) { 108 113 wchar_t ch = ski_getchar(); … … 122 127 123 128 while (true) { 124 // TODO FIXME: 125 // This currently breaks the kernel console 126 // before we get the override from uspace. 127 if (console_override) 128 poll_keyboard(instance); 129 129 poll_keyboard(instance); 130 130 thread_usleep(POLL_INTERVAL); 131 131 } … … 140 140 static void ski_init(void) 141 141 { 142 uintptr_t faddr; 143 142 144 if (instance) 143 145 return; … … 150 152 : "r15", "r8" 151 153 ); 154 155 faddr = frame_alloc(1, FRAME_LOWMEM | FRAME_ATOMIC, 0); 156 if (faddr == 0) 157 panic("Cannot allocate page for ski console."); 158 159 ddi_parea_init(&ski_parea); 160 ski_parea.pbase = faddr; 161 ski_parea.frames = 1; 162 ski_parea.unpriv = false; 163 ski_parea.mapped = false; 164 ddi_parea_register(&ski_parea); 165 166 sysinfo_set_item_val("ski.paddr", NULL, (sysarg_t) faddr); 152 167 153 168 instance = malloc(sizeof(ski_instance_t)); … … 190 205 static void ski_putwchar(outdev_t *dev, wchar_t ch) 191 206 { 192 // TODO FIXME: 193 // This currently breaks the kernel console 194 // before we get the override from uspace. 195 if (console_override) { 196 if (ascii_check(ch)) { 197 if (ch == '\n') 198 ski_do_putchar('\r'); 199 200 ski_do_putchar(ch); 201 } else { 202 ski_do_putchar('?'); 203 } 207 if (ski_parea.mapped) 208 return; 209 210 if (ascii_check(ch)) { 211 if (ch == '\n') 212 ski_do_putchar('\r'); 213 214 ski_do_putchar(ch); 215 } else { 216 ski_do_putchar('?'); 204 217 } 205 218 } -
kernel/generic/include/mm/as.h
r103db908 r04c35fca 268 268 269 269 extern as_t *as_create(unsigned int); 270 extern void as_destroy(as_t *);271 270 extern void as_hold(as_t *); 272 271 extern void as_release(as_t *); -
kernel/generic/src/console/console.c
r103db908 r04c35fca 209 209 void grab_console(void) 210 210 { 211 sysinfo_set_item_val("kconsole", NULL, true); 211 212 event_notify_1(EVENT_KCONSOLE, false, true); 212 213 bool prev = console_override; … … 226 227 void release_console(void) 227 228 { 229 sysinfo_set_item_val("kconsole", NULL, false); 228 230 console_override = false; 229 231 event_notify_1(EVENT_KCONSOLE, false, false); -
kernel/generic/src/mm/as.c
r103db908 r04c35fca 187 187 * 188 188 */ 189 void as_destroy(as_t *as)189 static void as_destroy(as_t *as) 190 190 { 191 191 DEADLOCK_PROBE_INIT(p_asidlock); -
kernel/generic/src/proc/program.c
r103db908 r04c35fca 150 150 prg->loader_status = elf_load((elf_header_t *) image_addr, as); 151 151 if (prg->loader_status != EE_OK) { 152 as_ destroy(as);152 as_release(as); 153 153 prg->task = NULL; 154 154 prg->main_thread = NULL; … … 176 176 void *loader = program_loader; 177 177 if (!loader) { 178 as_ destroy(as);178 as_release(as); 179 179 log(LF_OTHER, LVL_ERROR, 180 180 "Cannot spawn loader as none was registered"); … … 184 184 prg->loader_status = elf_load((elf_header_t *) program_loader, as); 185 185 if (prg->loader_status != EE_OK) { 186 as_ destroy(as);186 as_release(as); 187 187 log(LF_OTHER, LVL_ERROR, "Cannot spawn loader (%s)", 188 188 elf_error(prg->loader_status)); -
uspace/drv/char/ski-con/ski-con.c
r103db908 r04c35fca 1 1 /* 2 2 * Copyright (c) 2005 Jakub Jermar 3 * Copyright (c) 201 7Jiri Svoboda3 * Copyright (c) 2018 Jiri Svoboda 4 4 * All rights reserved. 5 5 * … … 31 31 */ 32 32 33 #include <as.h> 33 34 #include <async.h> 34 35 #include <ddf/driver.h> 35 36 #include <ddf/log.h> 37 #include <ddi.h> 36 38 #include <errno.h> 37 39 #include <fibril.h> … … 40 42 #include <stdlib.h> 41 43 #include <stdbool.h> 44 #include <sysinfo.h> 42 45 43 46 #include "ski-con.h" … … 68 71 ddf_fun_t *fun = NULL; 69 72 bool bound = false; 73 uintptr_t faddr; 74 void *addr = AS_AREA_ANY; 70 75 errno_t rc; 71 76 … … 87 92 con->cds.sarg = con; 88 93 94 rc = sysinfo_get_value("ski.paddr", &faddr); 95 if (rc != EOK) 96 faddr = 0; /* No kernel driver to arbitrate with */ 97 98 if (faddr != 0) { 99 addr = AS_AREA_ANY; 100 rc = physmem_map(faddr, 1, AS_AREA_READ | AS_AREA_CACHEABLE, 101 &addr); 102 if (rc != EOK) { 103 ddf_msg(LVL_ERROR, "Cannot map kernel driver arbitration area."); 104 goto error; 105 } 106 } 107 89 108 rc = ddf_fun_bind(fun); 90 109 if (rc != EOK) { … … 107 126 return EOK; 108 127 error: 128 if (addr != AS_AREA_ANY) 129 as_area_destroy(addr); 109 130 if (bound) 110 131 ddf_fun_unbind(fun); … … 127 148 } 128 149 150 /** Detect if SKI console is in use by the kernel. 151 * 152 * This is needed since the kernel has no way of fencing off the user-space 153 * driver. 154 * 155 * @return @c true if in use by the kernel. 156 */ 157 static bool ski_con_disabled(void) 158 { 159 sysarg_t kconsole; 160 161 /* 162 * XXX Ideally we should get information from our kernel counterpart 163 * driver. But there needs to be a mechanism for the kernel console 164 * to inform the kernel driver. 165 */ 166 if (sysinfo_get_value("kconsole", &kconsole) != EOK) 167 return false; 168 169 return kconsole != false; 170 } 171 129 172 /** Poll Ski for keypresses. */ 130 173 static errno_t ski_con_fibril(void *arg) … … 135 178 136 179 while (true) { 137 while ( true) {180 while (!ski_con_disabled()) { 138 181 c = ski_con_getchar(); 139 182 if (c == 0) … … 246 289 uint8_t *dp = (uint8_t *) data; 247 290 248 for (i = 0; i < size; i++) 249 ski_con_putchar(con, dp[i]); 291 if (!ski_con_disabled()) { 292 for (i = 0; i < size; i++) { 293 ski_con_putchar(con, dp[i]); 294 } 295 } 250 296 251 297 *nwr = size; -
uspace/drv/char/ski-con/ski-con.h
r103db908 r04c35fca 56 56 fibril_mutex_t buf_lock; 57 57 fibril_condvar_t buf_cv; 58 /** Memory area mapped to arbitrate with the kernel driver */ 59 void *mem_area; 58 60 } ski_con_t; 59 61 -
uspace/lib/c/generic/loader.c
r103db908 r04c35fca 200 200 } 201 201 202 rc = loader_set_program(ldr, path, fd);202 rc = loader_set_program(ldr, abspath, fd); 203 203 vfs_put(fd); 204 204 return rc;
Note:
See TracChangeset
for help on using the changeset viewer.