Commit 2c9e0cb0 authored by Christopher Brannon's avatar Christopher Brannon Committed by Greg Kroah-Hartman
Browse files

staging: speakup: speakup_dtlk.c: style fixes 



* Clean this file based on reports from checkpatch.pl.
* Replace function-like macros with inline functions.
* Simplify some boolean expressions.

Signed-off-by: default avatarChristopher Brannon <chris@the-brannons.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 227e18d6

drivers/staging/speakup/speakup_dtlk.c

+36 −20
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ 


#define DRV_VERSION "2.10"

#define PROCSPEECH 0x00

#define synth_readable() ((synth_status = inb_p(speakup_info.port_tts + UART_RX)) & TTS_READABLE)

#define synth_writable() ((synth_status = inb_p(speakup_info.port_tts + UART_RX)) & TTS_WRITABLE)

#define synth_full() ((synth_status = inb_p(speakup_info.port_tts + UART_RX)) & TTS_ALMOST_FULL)



static int synth_probe(struct spk_synth *synth);

static void dtlk_release(void);
@@ -47,8 +44,9 @@ static void synth_flush(struct spk_synth *synth); 


static int synth_lpc;

static int port_forced;

static unsigned int synth_portlist[] =

		{ 0x25e, 0x29e, 0x2de, 0x31e, 0x35e, 0x39e, 0 };

static unsigned int synth_portlist[] = {

		 0x25e, 0x29e, 0x2de, 0x31e, 0x35e, 0x39e, 0

};

static u_char synth_status;



static struct var_t vars[] = {
@@ -155,17 +153,35 @@ static struct spk_synth synth_dtlk = { 
	},

};



static inline bool synth_readable(void)

{

	synth_status = inb_p(speakup_info.port_tts + UART_RX);

	return (synth_status & TTS_READABLE) != 0;

}



static inline bool synth_writable(void)

{

	synth_status = inb_p(speakup_info.port_tts + UART_RX);

	return (synth_status & TTS_WRITABLE) != 0;

}



static inline bool synth_full(void)

{

	synth_status = inb_p(speakup_info.port_tts + UART_RX);

	return (synth_status & TTS_ALMOST_FULL) != 0;

}



static void spk_out(const char ch)

{

	int timeout = SPK_XMITR_TIMEOUT;

	while (synth_writable() == 0) {

	while (!synth_writable()) {

		if (!--timeout)

			break;

		udelay(1);

	}

	outb_p(ch, speakup_info.port_tts);

	timeout = SPK_XMITR_TIMEOUT;

	while (synth_writable() != 0) {

	while (synth_writable()) {

		if (!--timeout)

			break;

		udelay(1);
@@ -244,18 +260,18 @@ static const char *synth_immediate(struct spk_synth *synth, const char *buf) 
static void synth_flush(struct spk_synth *synth)

{

	outb_p(SYNTH_CLEAR, speakup_info.port_tts);

	while (synth_writable() != 0)

	while (synth_writable())

		cpu_relax();

}



static char synth_read_tts(void)

{

	u_char ch;

	while (synth_readable() == 0)

	while (!synth_readable())

		cpu_relax();

	ch = synth_status & 0x7f;

	outb_p(ch, speakup_info.port_tts);

	while (synth_readable() != 0)

	while (synth_readable())

		cpu_relax();

	return (char) ch;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE