w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-19 10:32:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

- simple cleanup of style, no code changes

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@193 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Diane Bruce 2006-07-06 20:54:51 +00:00
parent f67ddfba36
commit 65ab0e52ea
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
start_oss.c
View File

@ -94,10 +94,12 @@ start_threads_(int *ndevin, int *ndevout, short y1[], short y2[],
int i; int i;
char *p; char *p;
/* Remove space if present */
p = strchr(devin_name, ' '); p = strchr(devin_name, ' ');
if(p != NULL) if(p != NULL)
*p = '\0'; *p = '\0';
/* If there is a '/' in the name assume it is /dev/name */
p = strchr(devin_name, '/'); p = strchr(devin_name, '/');
if(p != NULL) if(p != NULL)
snprintf(dsp_in, MAXDSPNAME, "%s", devin_name); /* assume /dev/... */ snprintf(dsp_in, MAXDSPNAME, "%s", devin_name); /* assume /dev/... */
@ -106,9 +108,9 @@ start_threads_(int *ndevin, int *ndevout, short y1[], short y2[],
dsp_in[MAXDSPNAME] = '\0'; dsp_in[MAXDSPNAME] = '\0';
data.fd_in = open (dsp_in, O_RDWR, 0); data.fd_in = open(dsp_in, O_RDWR, 0);
if (data.fd_in < 0) { if(data.fd_in < 0) {
fprintf(stderr, "Cannot open %s for input.\n", dsp_in); fprintf(stderr, "Cannot open %s for input.\n", dsp_in);
exit(-1); exit(-1);
} }
@ -117,7 +119,7 @@ start_threads_(int *ndevin, int *ndevout, short y1[], short y2[],
strncpy(dsp_out, dsp_in, sizeof(dsp_out)); strncpy(dsp_out, dsp_in, sizeof(dsp_out));
dsp_out[sizeof(dsp_out)] = '\0'; dsp_out[sizeof(dsp_out)] = '\0';
if (ioctl(data.fd_in, SNDCTL_DSP_SETDUPLEX, 0) < 0) { if(ioctl(data.fd_in, SNDCTL_DSP_SETDUPLEX, 0) < 0) {
fprintf(stderr, "Cannot use %s for full duplex.\n", dsp_in); fprintf(stderr, "Cannot use %s for full duplex.\n", dsp_in);
return(-1); return(-1);
} }
@ -142,23 +144,23 @@ start_threads_(int *ndevin, int *ndevout, short y1[], short y2[],
dnfs=(double)*nfsample; dnfs=(double)*nfsample;
channels = 2; channels = 2;
if (ioctl (data.fd_in, SNDCTL_DSP_CHANNELS, &channels) == -1) { if(ioctl (data.fd_in, SNDCTL_DSP_CHANNELS, &channels) == -1) {
fprintf (stderr, "Unable to set 2 channels for input.\n"); fprintf (stderr, "Unable to set 2 channels for input.\n");
exit (-1); exit (-1);
} }
if (channels != 2) { if(channels != 2) {
fprintf (stderr, "Unable to set 2 channels.\n"); fprintf (stderr, "Unable to set 2 channels.\n");
exit (-1); exit (-1);
} }
format = AFMT_S16_NE; format = AFMT_S16_NE;
if (ioctl (data.fd_in, SNDCTL_DSP_SETFMT, &format) == -1) { if(ioctl (data.fd_in, SNDCTL_DSP_SETFMT, &format) == -1) {
fprintf (stderr, "Unable to set format for input.\n"); fprintf (stderr, "Unable to set format for input.\n");
exit (-1); exit (-1);
} }
if (ioctl (data.fd_in, SNDCTL_DSP_SPEED, &rate) == -1) { if(ioctl (data.fd_in, SNDCTL_DSP_SPEED, &rate) == -1) {
fprintf (stderr, "Unable to set rate for input\n"); fprintf (stderr, "Unable to set rate for input\n");
exit (-1); exit (-1);
} }
@ -213,14 +215,14 @@ oss_loop(int *iarg)
FD_SET(data.fd_out, &writefds); FD_SET(data.fd_out, &writefds);
timeout.tv_usec = TIMEOUT; timeout.tv_usec = TIMEOUT;
if (select(FD_SETSIZE, &readfds, &writefds, NULL, &timeout) > 0) { if(select(FD_SETSIZE, &readfds, &writefds, NULL, &timeout) > 0) {
if (FD_ISSET(data.fd_in, &readfds)) { if(FD_ISSET(data.fd_in, &readfds)) {
nread = read (data.fd_in, rcv_buf, AUDIOBUFSIZE); nread = read (data.fd_in, rcv_buf, AUDIOBUFSIZE);
if (nread <= 0) { if(nread <= 0) {
fprintf(stderr, "Read error %d\n", nread); fprintf(stderr, "Read error %d\n", nread);
return; return;
} }
if (nread == AUDIOBUFSIZE) { if(nread == AUDIOBUFSIZE) {
/* Get System time */ /* Get System time */
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
stime = (double) tv.tv_sec + ((double)tv.tv_usec / 1000000.0) + stime = (double) tv.tv_sec + ((double)tv.tv_usec / 1000000.0) +
@ -250,25 +252,25 @@ oss_loop(int *iarg)
fivehz_(); /* Call fortran routine */ fivehz_(); /* Call fortran routine */
} }
} }
if (FD_ISSET(data.fd_in, &writefds)) { if(FD_ISSET(data.fd_in, &writefds)) {
/* Get System time */ /* Get System time */
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
stime = (double) tv.tv_sec + ((double)tv.tv_usec / 1000000.0) + stime = (double) tv.tv_sec + ((double)tv.tv_usec / 1000000.0) +
*(data.ndsec) * 0.1; *(data.ndsec) * 0.1;
*(data.Tsec) = stime; *(data.Tsec) = stime;
if(*(data.TxOK) && (!TxOKz)) { if(*(data.TxOK) && (!TxOKz)) {
nsec = (int)stime; nsec = (int)stime;
n = nsec/(*(data.trperiod)); n = nsec / *(data.trperiod);
ic = (int)(stime - *(data.trperiod)*n) * data.nfs; ic = (int)(stime - *(data.trperiod) * n) * data.nfs;
ic = ic % *(data.nwave); ic = ic % *(data.nwave);
} }
TxOKz = *(data.TxOK); TxOKz = *(data.TxOK);
*(data.Transmitting) = *(data.TxOK); *(data.Transmitting) = *(data.TxOK);
wptr = (int16_t *)tx_buf; /* XXX */ wptr = (int16_t *)tx_buf; /* XXX */
if(*(data.TxOK)) { if(*(data.TxOK)) {
for(i=0 ; i<FRAMESPERBUFFER; i++ ) { for(i=0 ; i<FRAMESPERBUFFER; i++) {
n2 = data.iwave[ic]; n2 = data.iwave[ic];
addnoise_(&n2); addnoise_(&n2);
*wptr++ = n2; /* left */ *wptr++ = n2; /* left */
@ -283,8 +285,7 @@ oss_loop(int *iarg)
} else { } else {
memset(tx_buf, 0, AUDIOBUFSIZE); memset(tx_buf, 0, AUDIOBUFSIZE);
} }
if(write(data.fd_out, tx_buf, AUDIOBUFSIZE) < 0) {
if (write(data.fd_out, tx_buf, AUDIOBUFSIZE) < 0) {
fprintf(stderr, "Can't write to soundcard.\n"); fprintf(stderr, "Can't write to soundcard.\n");
return; return;
} }