Skip to content

Commit

Permalink
[PATCH] dz: Fixes to make it work
Browse files Browse the repository at this point in the history
This a set of fixes mostly to make the driver actually work:

1. Actually select the line for setting parameters and receiver
   disable/enable.
2. Select the line for receive and transmit interrupt handling correctly.
3. Report the transmitter empty state correctly.
4. Set the I/O type of ports correctly.
5. Perform polled transmission correctly.
6. Don't fix the console line at ttyS3.
7. Magic SysRq support.
8. Various small bits here and there.

Tested with a DECstation 2100 (thanks Flo for making this possible).

[akpm@osdl.org: fix typo]
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Maciej W. Rozycki authored and Linus Torvalds committed Dec 7, 2006
1 parent f7dff2b commit 9399575
Show file tree
Hide file tree
Showing 3 changed files with 212 additions and 229 deletions.
38 changes: 3 additions & 35 deletions drivers/char/decserial.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,12 @@
extern int zs_init(void);
#endif

#ifdef CONFIG_DZ
extern int dz_init(void);
#endif

#ifdef CONFIG_SERIAL_CONSOLE

#ifdef CONFIG_ZS
extern void zs_serial_console_init(void);
#endif

#ifdef CONFIG_DZ
extern void dz_serial_console_init(void);
#endif

#endif

/* rs_init - starts up the serial interface -
Expand All @@ -46,23 +38,11 @@ extern void dz_serial_console_init(void);

int __init rs_init(void)
{

#if defined(CONFIG_ZS) && defined(CONFIG_DZ)
#ifdef CONFIG_ZS
if (IOASIC)
return zs_init();
else
return dz_init();
#else

#ifdef CONFIG_ZS
return zs_init();
#endif

#ifdef CONFIG_DZ
return dz_init();
#endif

#endif
return -ENXIO;
}

__initcall(rs_init);
Expand All @@ -76,21 +56,9 @@ __initcall(rs_init);
*/
static int __init decserial_console_init(void)
{
#if defined(CONFIG_ZS) && defined(CONFIG_DZ)
#ifdef CONFIG_ZS
if (IOASIC)
zs_serial_console_init();
else
dz_serial_console_init();
#else

#ifdef CONFIG_ZS
zs_serial_console_init();
#endif

#ifdef CONFIG_DZ
dz_serial_console_init();
#endif

#endif
return 0;
}
Expand Down
Loading

0 comments on commit 9399575

Please sign in to comment.