* Copyright (c) 2005-2006 Apple Computer, Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- *
+ *
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
* unlawful or unlicensed copies of an Apple operating system, or to
* circumvent, violate, or enable the circumvention or violation of, any
* terms of an Apple operating system software license agreement.
- *
+ *
* Please obtain a copy of the License at
* http://www.opensource.apple.com/apsl/ and read it before using this file.
- *
+ *
* The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
* Please see the License for the specific language governing rights and
* limitations under the License.
- *
+ *
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/*
#include <console/serial_protos.h>
#include <libkern/section_keywords.h>
-extern void cons_cinput(char ch); /* The BSD routine that gets characters */
+extern void cons_cinput(char ch); /* The BSD routine that gets characters */
-SECURITY_READ_ONLY_LATE(unsigned int) serialmode; /* Serial mode keyboard and console control */
+SECURITY_READ_ONLY_LATE(unsigned int) serialmode; /* Serial mode keyboard and console control */
/*
* This routine will start a thread that polls the serial port, listening for
void
serial_keyboard_init(void)
{
- kern_return_t result;
- thread_t thread;
+ kern_return_t result;
+ thread_t thread;
- if(!(serialmode & SERIALMODE_INPUT)) /* Leave if we do not want a serial console */
+ if (!(serialmode & SERIALMODE_INPUT)) { /* Leave if we do not want a serial console */
return;
+ }
kprintf("Serial keyboard started\n");
result = kernel_thread_start_priority((thread_continue_t)serial_keyboard_start, NULL, MAXPRI_KERNEL, &thread);
- if (result != KERN_SUCCESS)
+ if (result != KERN_SUCCESS) {
panic("serial_keyboard_init");
+ }
thread_deallocate(thread);
}
{
/* Go see if there are any characters pending now */
serial_keyboard_poll();
- panic("serial_keyboard_start: we can't get back here\n");
}
+__dead2
void
serial_keyboard_poll(void)
{
int chr;
uint64_t next;
- while(1) {
- chr = _serial_getc(0, 1, 0, 1); /* Get a character if there is one */
- if(chr < 0) /* The serial buffer is empty */
+ while (1) {
+ chr = _serial_getc(0, 1, 0, 1); /* Get a character if there is one */
+ if (chr < 0) { /* The serial buffer is empty */
break;
- cons_cinput((char)chr); /* Buffer up the character */
+ }
+ cons_cinput((char)chr); /* Buffer up the character */
}
- clock_interval_to_deadline(16, 1000000, &next); /* Get time of pop */
+ clock_interval_to_deadline(16, 1000000, &next); /* Get time of pop */
- assert_wait_deadline((event_t)serial_keyboard_poll, THREAD_UNINT, next); /* Show we are "waiting" */
- thread_block((thread_continue_t)serial_keyboard_poll); /* Wait for it */
+ assert_wait_deadline((event_t)serial_keyboard_poll, THREAD_UNINT, next); /* Show we are "waiting" */
+ thread_block((thread_continue_t)serial_keyboard_poll); /* Wait for it */
panic("serial_keyboard_poll: Shouldn't never ever get here...\n");
}
boolean_t
console_is_serial(void)
{
- return (cons_ops_index == SERIAL_CONS_OPS);
+ return cons_ops_index == SERIAL_CONS_OPS;
}
int
int
switch_to_serial_console(void)
{
+ extern bool serial_console_enabled;
int old_cons_ops = cons_ops_index;
- cons_ops_index = SERIAL_CONS_OPS;
+
+ if (serial_console_enabled) {
+ cons_ops_index = SERIAL_CONS_OPS;
+ }
+
return old_cons_ops;
}
/* The switch_to_{video,serial,kgdb}_console functions return a cookie that
- can be used to restore the console to whatever it was before, in the
- same way that splwhatever() and splx() work. */
+ * can be used to restore the console to whatever it was before, in the
+ * same way that splwhatever() and splx() work. */
void
switch_to_old_console(int old_console)
{
if ((ops >= nconsops) && !squawked) {
squawked = TRUE;
printf("switch_to_old_console: unknown ops %d\n", ops);
- } else
+ } else {
cons_ops_index = ops;
+ }
}
void
console_printbuf_state_init(struct console_printbuf_state * data, int write_on_newline, int can_block)
{
- if (data == NULL)
+ if (data == NULL) {
return;
+ }
bzero(data, sizeof(struct console_printbuf_state));
- if (write_on_newline)
+ if (write_on_newline) {
data->flags |= CONS_PB_WRITE_NEWLINE;
- if (can_block)
+ }
+ if (can_block) {
data->flags |= CONS_PB_CANBLOCK;
+ }
}
void
struct console_printbuf_state * info = (struct console_printbuf_state *)arg;
info->total += 1;
if (info->pos < (SERIAL_CONS_BUF_SIZE - 1)) {
- info->str[info->pos] = ch;
+ info->str[info->pos] = (char)ch;
info->pos += 1;
} else {
/*
info->str[info->pos] = '\0';
console_write(info->str, info->pos);
info->pos = 0;
- info->str[info->pos] = ch;
+ info->str[info->pos] = (char)ch;
info->pos += 1;
}
}
}
void
-console_printbuf_clear(struct console_printbuf_state * info) {
+console_printbuf_clear(struct console_printbuf_state * info)
+{
if (info->pos != 0) {
console_write(info->str, info->pos);
}
info->str[info->pos] = '\0';
info->total = 0;
}
-
projects / apple / xnu.git / blobdiff