Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89fc2ae8 authored by Samuel Thibault's avatar Samuel Thibault Committed by Greg Kroah-Hartman
Browse files

speakup: extend synth buffer to 16bit unicode characters 



This extends the synth buffer slots to 16bit, so as to hold 16bit
unicode characters.

synth_buffer_getc and synth_buffer_peek now return 16bit characters.
Speech synthesizers which do not support characters beyond latin1 can
use the synth_buffer_skip_nonlatin1() helper to skip the non-latin1
characters before getting or peeking. All synthesizers are made to use
it for now.

This makes synth_buffer_add take a 16bit character. For simplicity for
now, synth_printf is left to using latin1 formats and strings.
synth_putwc, synth_putwc_s, synth_putws and synth_putws_s helpers are
however added to put 16bit characters and strings.

Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: default avatarChris Brannon <chris@the-brannons.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 981b7ae9

drivers/staging/speakup/buffers.c

+24 −12
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ 


#define SYNTH_BUF_SIZE 8192	/* currently 8K bytes */



static u_char synth_buffer[SYNTH_BUF_SIZE];	/* guess what this is for! */

static u_char *buff_in = synth_buffer;

static u_char *buff_out = synth_buffer;

static u_char *buffer_end = synth_buffer + SYNTH_BUF_SIZE - 1;

static u16 synth_buffer[SYNTH_BUF_SIZE];	/* guess what this is for! */

static u16 *buff_in = synth_buffer;

static u16 *buff_out = synth_buffer;

static u16 *buffer_end = synth_buffer + SYNTH_BUF_SIZE - 1;



/* These try to throttle applications by stopping the TTYs

 * Note: we need to make sure that we will restart them eventually, which is
@@ -44,13 +44,13 @@ static void speakup_stop_ttys(void) 


static int synth_buffer_free(void)

{

	int bytes_free;

	int chars_free;



	if (buff_in >= buff_out)

		bytes_free = SYNTH_BUF_SIZE - (buff_in - buff_out);

		chars_free = SYNTH_BUF_SIZE - (buff_in - buff_out);

	else

		bytes_free = buff_out - buff_in;

	return bytes_free;

		chars_free = buff_out - buff_in;

	return chars_free;

}



int synth_buffer_empty(void)
@@ -59,7 +59,7 @@ int synth_buffer_empty(void) 
}

EXPORT_SYMBOL_GPL(synth_buffer_empty);



void synth_buffer_add(char ch)

void synth_buffer_add(u16 ch)

{

	if (!synth->alive) {

		/* This makes sure that we won't stop TTYs if there is no synth
@@ -78,9 +78,9 @@ void synth_buffer_add(char ch) 
		buff_in = synth_buffer;

}



char synth_buffer_getc(void)

u16 synth_buffer_getc(void)

{

	char ch;

	u16 ch;



	if (buff_out == buff_in)

		return 0;
@@ -91,7 +91,7 @@ char synth_buffer_getc(void) 
}

EXPORT_SYMBOL_GPL(synth_buffer_getc);



char synth_buffer_peek(void)

u16 synth_buffer_peek(void)

{

	if (buff_out == buff_in)

		return 0;
@@ -99,6 +99,18 @@ char synth_buffer_peek(void) 
}

EXPORT_SYMBOL_GPL(synth_buffer_peek);



void synth_buffer_skip_nonlatin1(void)

{

	while (buff_out != buff_in) {

		if (*buff_out < 0x100)

			return;

		buff_out++;

		if (buff_out > buffer_end)

			buff_out = synth_buffer;

	}

}

EXPORT_SYMBOL_GPL(synth_buffer_skip_nonlatin1);



void synth_buffer_clear(void)

{

	buff_in = synth_buffer;

drivers/staging/speakup/speakup.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void synth_release(void); 


void spk_do_flush(void);

void speakup_start_ttys(void);

void synth_buffer_add(char ch);

void synth_buffer_add(u16 ch);

void synth_buffer_clear(void);

void speakup_clear_selection(void);

int speakup_set_selection(struct tty_struct *tty);

drivers/staging/speakup/speakup_acntpc.c

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ static void do_catch_up(struct spk_synth *synth) 
			synth->flush(synth);

			continue;

		}

		synth_buffer_skip_nonlatin1();

		if (synth_buffer_empty()) {

			spin_unlock_irqrestore(&speakup_info.spinlock, flags);

			break;

drivers/staging/speakup/speakup_apollo.c

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ static void do_catch_up(struct spk_synth *synth) 
			synth->flush(synth);

			continue;

		}

		synth_buffer_skip_nonlatin1();

		if (synth_buffer_empty()) {

			spin_unlock_irqrestore(&speakup_info.spinlock, flags);

			break;

drivers/staging/speakup/speakup_decext.c

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ static void do_catch_up(struct spk_synth *synth) 
			synth->flush(synth);

			continue;

		}

		synth_buffer_skip_nonlatin1();

		if (synth_buffer_empty()) {

			spin_unlock_irqrestore(&speakup_info.spinlock, flags);

			break;