I had a patch which also worked, but yours may be better -- I enclose it
here for your information.
--- drivers/staging/speakup/serialio.h.old 2015-08-30 14:34:09.000000000 -0400
+++ drivers/staging/speakup/serialio.h 2015-10-07 06:27:04.880829874 -0400
@@ -1,22 +1,24 @@
#ifndef _SPEAKUP_SERIAL_H
#define _SPEAKUP_SERIAL_H
+#include <linux/serial_core.h>
#include <linux/serial.h> /* for rs_table, serial constants */
#include <linux/serial_reg.h> /* for more serial constants */
#ifndef __sparc__
-#include <linux/serial.h>
+#include <asm/serial.h>
#endif
/*
* this is cut&paste from 8250.h. Get rid of the structure, the definitions
* and this whole broken driver.
*/
+
struct old_serial_port {
unsigned int uart; /* unused */
unsigned int baud_base;
unsigned int port;
unsigned int irq;
- unsigned int flags; /* unused */
+ upf_t flags; /*unused*/
};
/* countdown values for serial timeouts in us */
@@ -34,7 +36,6 @@
#define SPK_TIMEOUT 100
#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-#define spk_serial_tx_busy() \
- ((inb(speakup_info.port_tts + UART_LSR) & BOTH_EMPTY) != BOTH_EMPTY)
+#define spk_serial_tx_busy() ((inb(speakup_info.port_tts + UART_LSR) & BOTH_EMPTY) != BOTH_EMPTY)
#endif
Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> wrote:
> 5e6dc54 broke the port information in the speakup driver:
> SERIAL_PORT_DFNS only gets defined if asm/serial.h is included.
>
> Along the way, make sure that we do have information for the requested
> serial port number (index)
>
> Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
>
> --- a/drivers/staging/speakup/serialio.c
> +++ b/drivers/staging/speakup/serialio.c
> @@ -6,6 +6,9 @@
> #include "spk_priv.h"
> #include "serialio.h"
>
> +#include <linux/serial_core.h>
> +#include <asm/serial.h>
> +
> #ifndef SERIAL_PORT_DFNS
> #define SERIAL_PORT_DFNS
> #endif
> @@ -26,6 +29,11 @@ const struct old_serial_port *spk_serial
> const struct old_serial_port *ser = rs_table + index;
> int err;
>
> + if (index > sizeof(rs_table) / sizeof(*rs_table)) {
> + pr_info("no port info for ttyS%d\n", index);
> + return NULL;
> + }
> +
> /* Divisor, bytesize and parity */
> quot = ser->baud_base / baud;
> cval = cflag & (CSIZE | CSTOPB);
> _______________________________________________
> Speakup mailing list
> Speakup@xxxxxxxxxxxxxxxxx
> http://linux-speakup.org/cgi-bin/mailman/listinfo/speakup
>
--
Your life is like a penny. You're going to lose it. The question is:
How do
you spend it?
John Covici
covici@xxxxxxxxxxxxxx
_______________________________________________
Speakup mailing list
Speakup@xxxxxxxxxxxxxxxxx
http://linux-speakup.org/cgi-bin/mailman/listinfo/speakup
