Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace MACHINE/CHIP macros with compiler macros

Browse Source
This commit is contained in:
Arun Thomas
2012-08-06 12:55:50 +02:00
parent 5919360736
commit 6723dcfab7
27 changed files with 45 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/tty/rs232.c
View File

@@ -139,7 +139,7 @@ typedef struct rs232 {
char *ohead; /* next free spot in output buffer */
char *otail; /* next char to output */
#if (MACHINE == IBM_PC)
#if defined(__i386__)
port_t xmit_port; /* i/o ports */
port_t recv_port;
port_t div_low_port;
@@ -168,7 +168,7 @@ typedef struct rs232 {
static rs232_t rs_lines[NR_RS_LINES];
#if (MACHINE == IBM_PC)
#if defined(__i386__)
/* 8250 base addresses. */
static port_t addr_8250[] = {
0x3F8, /* COM1 */
@@ -352,7 +352,7 @@ static void rs_config(rs232_t *rs)
speed_t speed;
int divisor;
} s2d[] = {
#if (MACHINE == IBM_PC)
#if defined(__i386__)
{ B50, UART_FREQ / 50 },
#endif
{ B75, UART_FREQ / 75 },
@@ -363,14 +363,14 @@ static void rs_config(rs232_t *rs)
{ B300, UART_FREQ / 300 },
{ B600, UART_FREQ / 600 },
{ B1200, UART_FREQ / 1200 },
#if (MACHINE == IBM_PC)
#if defined(__i386__)
{ B1800, UART_FREQ / 1800 },
#endif
{ B2400, UART_FREQ / 2400 },
{ B4800, UART_FREQ / 4800 },
{ B9600, UART_FREQ / 9600 },
{ B19200, UART_FREQ / 19200 },
#if (MACHINE == IBM_PC)
#if defined(__i386__)
{ B38400, UART_FREQ / 38400 },
{ B57600, UART_FREQ / 57600 },
{ B115200, UART_FREQ / 115200L },

4
drivers/tty/tty.c
View File

@@ -588,7 +588,7 @@ message *m_ptr; /* pointer to message sent to task */
size = sizeof(struct winsize);
break;
#if (MACHINE == IBM_PC)
#if defined(__i386__)
case KIOCSMAP: /* load keymap (Minix extension) */
size = sizeof(keymap_t);
break;
@@ -681,7 +681,7 @@ message *m_ptr; /* pointer to message sent to task */
sigchar(tp, SIGWINCH, 0);
break;
#if (MACHINE == IBM_PC)
#if defined(__i386__)
case KIOCSMAP:
/* Load a new keymap (only /dev/console). */
if (isconsole(tp)) r = kbd_loadmap(m_ptr);

4
drivers/tty/tty.h
View File

@@ -154,7 +154,7 @@ int select_retry(struct tty *tp);
void rs_init(struct tty *tp);
void rs_interrupt(message *m);
#if (CHIP == INTEL)
#if defined(__i386__)
/* console.c */
void kputc(int c);
void cons_stop(void);
@@ -183,5 +183,5 @@ void pty_init(struct tty *tp);
void select_retry_pty(struct tty *tp);
int pty_status(message *m_ptr);
#endif /* (CHIP == INTEL) */
#endif /* defined(__i386__) */