kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_oss: Compile in Solaris 11.

Browse Source 
M_READ existed already and was conflicting in name.

Change-Id: I02108e07ae7d2dc314fe1e6c706c17731095a3e4
This commit is contained in:
Alexander Traud
2018-06-21 12:07:21 +02:00
parent e7ffbbd40e
commit 78855e13e8
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
channels/chan_oss.c
View File

@@ -257,7 +257,12 @@ struct chan_oss_pvt {
char *name; char *name;
int total_blocks; /*!< total blocks in the output device */ int total_blocks; /*!< total blocks in the output device */
int sounddev; int sounddev;
enum { M_UNSET, M_FULL, M_READ, M_WRITE } duplex; enum {
CHAN_OSS_DUPLEX_UNSET,
CHAN_OSS_DUPLEX_FULL,
CHAN_OSS_DUPLEX_READ,
CHAN_OSS_DUPLEX_WRITE
} duplex;
int autoanswer; /*!< Boolean: whether to answer the immediately upon calling */ int autoanswer; /*!< Boolean: whether to answer the immediately upon calling */
int autohangup; /*!< Boolean: whether to hangup the call when the remote end hangs up */ int autohangup; /*!< Boolean: whether to hangup the call when the remote end hangs up */
int hookstate; /*!< Boolean: 1 if offhook; 0 if onhook */ int hookstate; /*!< Boolean: 1 if offhook; 0 if onhook */
@@ -320,7 +325,7 @@ struct video_desc *get_video_desc(struct ast_channel *c)
} }
static struct chan_oss_pvt oss_default = { static struct chan_oss_pvt oss_default = {
.sounddev = -1, .sounddev = -1,
.duplex = M_UNSET, /* XXX check this */ .duplex = CHAN_OSS_DUPLEX_UNSET, /* XXX check this */
.autoanswer = 1, .autoanswer = 1,
.autohangup = 1, .autohangup = 1,
.queuesize = QUEUE_SIZE, .queuesize = QUEUE_SIZE,
@@ -482,7 +487,7 @@ static int setformat(struct chan_oss_pvt *o, int mode)
if (o->sounddev >= 0) { if (o->sounddev >= 0) {
ioctl(o->sounddev, SNDCTL_DSP_RESET, 0); ioctl(o->sounddev, SNDCTL_DSP_RESET, 0);
close(o->sounddev); close(o->sounddev);
o->duplex = M_UNSET; o->duplex = CHAN_OSS_DUPLEX_UNSET;
o->sounddev = -1; o->sounddev = -1;
} }
if (mode == O_CLOSE) /* we are done */ if (mode == O_CLOSE) /* we are done */
@@ -515,16 +520,16 @@ static int setformat(struct chan_oss_pvt *o, int mode)
res = ioctl(fd, SNDCTL_DSP_GETCAPS, &fmt); res = ioctl(fd, SNDCTL_DSP_GETCAPS, &fmt);
if (res == 0 && (fmt & DSP_CAP_DUPLEX)) { if (res == 0 && (fmt & DSP_CAP_DUPLEX)) {
ast_verb(2, "Console is full duplex\n"); ast_verb(2, "Console is full duplex\n");
o->duplex = M_FULL; o->duplex = CHAN_OSS_DUPLEX_FULL;
}; };
break; break;
case O_WRONLY: case O_WRONLY:
o->duplex = M_WRITE; o->duplex = CHAN_OSS_DUPLEX_WRITE;
break; break;
case O_RDONLY: case O_RDONLY:
o->duplex = M_READ; o->duplex = CHAN_OSS_DUPLEX_READ;
break; break;
} }
@@ -1418,7 +1423,7 @@ openit:
ast_verb(1, "Turn off OSS support by adding " "'noload=chan_oss.so' in /etc/asterisk/modules.conf\n"); ast_verb(1, "Turn off OSS support by adding " "'noload=chan_oss.so' in /etc/asterisk/modules.conf\n");
goto error; goto error;
} }
if (o->duplex != M_FULL) if (o->duplex != CHAN_OSS_DUPLEX_FULL)
ast_log(LOG_WARNING, "XXX I don't work right with non " "full-duplex sound cards XXX\n"); ast_log(LOG_WARNING, "XXX I don't work right with non " "full-duplex sound cards XXX\n");
#endif /* TRYOPEN */ #endif /* TRYOPEN */