← Back to branch summary

~ubuntu-branches/ubuntu/precise/speakup/precise

« back to all changes in this revision

Viewing changes to src/speakup_apollo.c

  • Committer: Bazaar Package Importer
  • Author(s): Samuel Thibault
  • Date: 2010-08-24 21:34:33 UTC
  • mfrom: (1.3.5 upstream)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20100824213433-suy4gzzolbzkhsgu
Tags: 3.1.5.dfsg.1-1
* New upstream fix-only release.
  Also cherry-pick upstream fixes up to de98895e.
* debian/control: Bump Standards-Version to 3.9.1 (no change needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/speakup_apollo.c
31
31
#include "serialio.h"
32
32
#include "speakup.h"
33
33
 
34
 
#define DRV_VERSION "2.20"
 
34
#define DRV_VERSION "2.21"
35
35
#define SYNTH_CLEAR 0x18
36
36
#define PROCSPEECH '\r'
37
37
 
45
45
        { VOL, .u.n = {"@A%x", 10, 0, 15, 0, 0, NULL }},
46
46
        { VOICE, .u.n = {"@V%d", 1, 1, 6, 0, 0, NULL }},
47
47
        { LANG, .u.n = {"@=%d,", 1, 1, 4, 0, 0, NULL }},
 
48
        { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL }},
48
49
        V_LAST_VAR
49
50
};
50
51
 
68
69
 
69
70
static struct kobj_attribute delay_time_attribute =
70
71
        __ATTR(delay_time, ROOT_W, spk_var_show, spk_var_store);
 
72
static struct kobj_attribute direct_attribute =
 
73
        __ATTR(direct, USER_RW, spk_var_show, spk_var_store);
71
74
static struct kobj_attribute full_time_attribute =
72
75
        __ATTR(full_time, ROOT_W, spk_var_show, spk_var_store);
73
76
static struct kobj_attribute jiffy_delta_attribute =
88
91
        &voice_attribute.attr,
89
92
        &vol_attribute.attr,
90
93
        &delay_time_attribute.attr,
 
94
        &direct_attribute.attr,
91
95
        &full_time_attribute.attr,
92
96
        &jiffy_delta_attribute.attr,
93
97
        &trigger_time_attribute.attr,