diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | gendigits.c | 28 |
2 files changed, 11 insertions, 19 deletions
@@ -229,7 +229,7 @@ torisatool: torisatool.o $(CC) -o $@ $^ tones.h: gendigits - ./gendigits + ./gendigits > $@ tor2fw.h: makefw tormenta2.rbt ./makefw tormenta2.rbt tor2fw > tor2fw.h diff --git a/gendigits.c b/gendigits.c index 73141d2..5ca0c51 100644 --- a/gendigits.c +++ b/gendigits.c @@ -95,7 +95,7 @@ short sample; { return(ulawbyte); } -int process(FILE *f, char *label, ZAP_DIAL z[], float low_tone_level, float high_tone_level) +int process(char *label, ZAP_DIAL z[], float low_tone_level, float high_tone_level) { char c; float gain; @@ -119,7 +119,7 @@ int process(FILE *f, char *label, ZAP_DIAL z[], float low_tone_level, float high init_v2_2 = sin(-4.0 * M_PI * (z->f2 / 8000.0)) * gain; init_v3_2 = sin(-2.0 * M_PI * (z->f2 / 8000.0)) * gain; - fprintf(f, "\t /* %s_%c */ { %d, %d, %d, %d, %d, %d, DEFAULT_DTMF_LENGTH, &%s_silence }, \n", label, c, + printf("\t /* %s_%c */ { %d, %d, %d, %d, %d, %d, DEFAULT_DTMF_LENGTH, &%s_silence }, \n", label, c, fac1, init_v2_1, init_v3_1, fac2, init_v2_2, init_v3_2, label); @@ -141,23 +141,15 @@ int process(FILE *f, char *label, ZAP_DIAL z[], float low_tone_level, float high int main(int argc, char *argv[]) { - FILE *f; - - if ((f = fopen("tones.h", "w"))) { - fprintf(f, "/* DTMF and MF tones used by the Tormenta Driver, in static tables.\n" + printf("/* DTMF and MF tones used by the Tormenta Driver, in static tables.\n" " Generated automatically from gendigits. Do not edit by hand. */\n"); - fprintf(f, "static struct zt_tone dtmf_tones[16] = {\n"); - process(f, "dtmf", dtmf_dial, LEVEL_DTMF_LOW, LEVEL_DTMF_HIGH); - fprintf(f, "};\n\n"); - fprintf(f, "static struct zt_tone mfv1_tones[15] = {\n"); - process(f, "mfv1", mf_dial, LEVEL_MF, LEVEL_MF); - fprintf(f, "};\n\n"); - fprintf(f, "/* END tones.h */\n"); - fclose(f); - } else { - fprintf(stderr, "Unable to open tones.h for writing\n"); - return 1; - } + printf("static struct zt_tone dtmf_tones[16] = {\n"); + process("dtmf", dtmf_dial, LEVEL_DTMF_LOW, LEVEL_DTMF_HIGH); + printf("};\n\n"); + printf("static struct zt_tone mfv1_tones[15] = {\n"); + process("mfv1", mf_dial, LEVEL_MF, LEVEL_MF); + printf("};\n\n"); + printf("/* END tones.h */\n"); return 0; } |