SPARC: First pass converting serial drivers to UART layer.

drivers/serial/suncore.h

@@ -15,41 +15,20 @@
 
 #include <linux/config.h>
 
-struct sun_initfunc {
-	int			(*init) (void);
-	struct sun_initfunc	*next;
-};
-
-struct sunserial_operations {
-	struct sun_initfunc	*rs_init;
-	void		(*rs_kgdb_hook) (int);
-	void		(*rs_change_mouse_baud) (int);
-	int		(*rs_read_proc) (char *, char **, off_t, int, int *, void *);
-};
-
-struct sunkbd_operations {
-	struct sun_initfunc	*kbd_init;
-	void		(*compute_shiftstate) (void);
-	void		(*setledstate) (struct kbd_struct *, unsigned int);
-	unsigned char	(*getledstate) (void);
-	int		(*setkeycode) (unsigned int, unsigned int);
-	int		(*getkeycode) (unsigned int);
-};
-
-extern struct sunserial_operations rs_ops;
-extern struct sunkbd_operations kbd_ops;
-
-extern void sunserial_setinitfunc(int (*) (void));
-extern void sunkbd_setinitfunc(int (*) (void));
+extern void sun_do_break(void);
+
+extern unsigned int suncore_mouse_baud_cflag_next(unsigned int, int *);
+extern int suncore_mouse_baud_detection(unsigned char, int);
 
 extern int serial_console;
 extern int stop_a_enabled;
-extern void sunserial_console_termios(struct console *);
+extern int sunserial_current_minor;
 
-#ifdef CONFIG_PCI
-extern void sunkbd_install_keymaps(ushort **, unsigned int, char *,
-				   char **, int, int, struct kbdiacr *,
-				   unsigned int);
-#endif
+static __inline__ int con_is_present(void)
+{
+	return serial_console ? 0 : 1;
+}
+
+extern void sunserial_console_termios(struct console *);
 
 #endif /* !(_SERIAL_SUN_H) */

drivers/serial/sunkbd.h

-/* $Id: sunkbd.h,v 1.4 2000/02/09 11:15:54 davem Exp $
- * sunkbd.h: Defines needed by SUN Keyboard drivers
- *
- * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
- */
-
-#ifndef _SPARC_SUNKBD_H
-#define _SPARC_SUNKBD_H 1
-
-#include <linux/config.h>
-
-/* Keyboard defines for L1-A processing... */
-#define SUNKBD_RESET		0xff
-#define SUNKBD_L1		0x01
-#define SUNKBD_UP		0x80
-#define SUNKBD_A		0x4d
-
-struct l1a_kbd_state {
-	int kbd_id;
-	int l1_down;
-};
-
-extern struct l1a_kbd_state l1a_state;
-
-extern void keyboard_zsinit(void (*kbd_put_char)(unsigned char));
-extern void sunkbd_inchar(unsigned char, struct pt_regs *);
-extern void batten_down_hatches(void);
-
-extern void sun_kbd_bh(unsigned long);
-extern int sun_kbd_init(void);
-extern void sun_compute_shiftstate(void);
-extern void sun_setledstate(struct kbd_struct *, unsigned int);
-extern unsigned char sun_getledstate(void);
-extern int sun_setkeycode(unsigned int, unsigned int);
-extern int sun_getkeycode(unsigned int);
-
-#ifdef CONFIG_PCI
-
-extern ushort *sun_key_maps[MAX_NR_KEYMAPS];
-extern unsigned int sun_keymap_count;
-
-extern char sun_func_buf[];
-extern char *sun_func_table[MAX_NR_FUNC];
-extern int sun_funcbufsize;
-extern int sun_funcbufleft;
-
-extern struct kbdiacr sun_accent_table[MAX_DIACR];
-extern unsigned int sun_accent_table_size;
-
-#endif /* CONFIG_PCI */
-
-#endif /* !(_SPARC_SUNKBD_H) */

drivers/serial/sunmouse.h

-/* $Id: sunmouse.h,v 1.2 1999/11/19 09:56:34 davem Exp $
- * sunmouse.h: Interface to the SUN mouse driver.
- *
- * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
- */
-
-#ifndef _SPARC_SUNMOUSE_H
-#define _SPARC_SUNMOUSE_H 1
-
-extern void sun_mouse_zsinit(void);
-extern void sun_mouse_inbyte(unsigned char, int);
-
-#endif /* !(_SPARC_SUNMOUSE_H) */

drivers/serial/sunsab.c

@@ -53,9 +53,6 @@ static DECLARE_TASK_QUEUE(tq_serial);
 static struct tty_driver serial_driver, callout_driver;
 static int sab82532_refcount;
 
-/* number of characters left in xmit buffer before we ask for more */
-#define WAKEUP_CHARS 256
-
 #undef SERIAL_PARANOIA_CHECK
 #define SERIAL_DO_RESTART
 
@@ -2618,7 +2615,6 @@ static struct console sab82532_console = {
 
 int __init sab82532_console_init(void)
 {
-	extern int con_is_present(void);
 	extern int su_console_registered;
 
 	if (con_is_present() || su_console_registered)