From 2aec54104ea9e8a2f4254f4d9ca0bdaeb0a52064 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Mon, 24 Jan 2005 15:58:55 +0000 Subject: [PATCH] Clesar decks before hacking TTY code. --- Makefile | 16 +--------------- morse.c | 5 ++++- morse.xml | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 0a5bb3e..4557f4e 100644 --- a/Makefile +++ b/Makefile @@ -27,28 +27,14 @@ #DEVICE = AdLib DEVICE = OSS -# -# For termio a la System V, add -DUSG to DEFINES. (Linux in particular needs -# this.) # # For alternate random number generator, add either -DUSELRAND for lrand48(), # or -DUSERAND for (ugh) rand(). Default is -DUSERANDOM for random(). # -# If the same speaker making the morse code beeps will also make ^G beeps -# (which occur when you get a letter wrong), you may want to #define -# ERROR_VOLUME to be 1.; this will cause the ^G beeps to be made using -# the same routines that do the morse-code beeps, possibly preventing -# conflicts. (If you prefer quieter error beeps, you can use anything -# between 0. and 1.; if you want it the same volume as the morse-code -# beeps, use "-DERROR_VOLUME=volume". If you don't like the pitch of -# the error tone, you can override the default by #defining ERROR_FREQ to -# be your favorite wake-up alarm frequency, in hertz.) -# # On a Sun workstation you may want to compile with -DFULLVOLUME (see beepSun.c # for more details). # -#DEFINES = -DUSG -DUSELRAND -DEFINES = -DUSG +#DEFINES = -DUSELRAND #DEFINES = -DFULLVOLUME #DEFINES = diff --git a/morse.c b/morse.c index 122dde7..1437a37 100644 --- a/morse.c +++ b/morse.c @@ -37,7 +37,7 @@ * added System V support. * * Joe Dellinger, Nov 1994: - * Fixed a bug in the termio calls for the -DUSG case. + * Fixed a bug in the USG termio calls. * Added an option to make the "error" beep come out via the beep * routines instead of by printing a control-G. * @@ -60,6 +60,7 @@ * Changed ALLPUNCTUATION to runtime -B option. * Changed ERROR_FREQUENCY to runtime -x option. * Changed ERROR_VOLUME to runtime -X option. + * Dropped BSD signal support. * Wrote the manual page. */ @@ -132,6 +133,8 @@ char copyleftjoe[] = #include #include "beep.h" +#define USG + #define FREQUENCY 800.0 #define FREQUENCY2 602.0 #define VOLUME 0.5 diff --git a/morse.xml b/morse.xml index 6046534..0c77fd9 100644 --- a/morse.xml +++ b/morse.xml @@ -48,7 +48,7 @@ -S -x num -X num - word + word -- 2.43.0