Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354000
b: refs/heads/master
c: 5c75af1
h: refs/heads/master
v: v3
  • Loading branch information
Lijo Antony authored and Greg Kroah-Hartman committed Jan 17, 2013
1 parent 3e80cc4 commit e19c2b0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cce17b457b3b346e5777ec770feb324663ea2b9b
refs/heads/master: 5c75af1a451ec14a218c830a8246a1b34fc91e59
14 changes: 7 additions & 7 deletions trunk/drivers/staging/speakup/buffers.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
#include "speakup.h"
#include "spk_priv.h"

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

static u_char synth_buffer[synthBufferSize]; /* guess what this is for! */
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+synthBufferSize-1;
static u_char *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
Expand Down Expand Up @@ -44,13 +44,13 @@ static void speakup_stop_ttys(void)

static int synth_buffer_free(void)
{
int bytesFree;
int bytes_free;

if (buff_in >= buff_out)
bytesFree = synthBufferSize - (buff_in - buff_out);
bytes_free = SYNTH_BUF_SIZE - (buff_in - buff_out);
else
bytesFree = buff_out - buff_in;
return bytesFree;
bytes_free = buff_out - buff_in;
return bytes_free;
}

int synth_buffer_empty(void)
Expand Down

0 comments on commit e19c2b0

Please sign in to comment.