[Asterisk-cvs] asterisk/channels chan_oss_old.c, NONE, 1.1 chan_oss.c, 1.52, 1.53

[markster]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv21744/channels

Modified Files:
	chan_oss.c 
Added Files:
	chan_oss_old.c 
Log Message:
Move to rizzo's new chan_oss, but leave the old one just in case... (bug #4379 with changes)


--- NEW FILE: chan_oss_old.c ---
/*
 * Asterisk -- A telephony toolkit for Linux.
 *
 * Use /dev/dsp as a channel, and the console to command it :).
 *
 * The full-duplex "simulation" is pretty weak.  This is generally a 
 * VERY BADLY WRITTEN DRIVER so please don't use it as a model for
 * writing a driver.
 * 
 * Copyright (C) 1999 - 2005, Digium, Inc.
 *
 * Mark Spencer <markster at digium.com>
 *
 * This program is free software, distributed under the terms of
 * the GNU General Public License
 */

#include <unistd.h>
#include <fcntl.h>
[...1081 lines suppressed...]
		ast_softhangup(oss.owner, AST_SOFTHANGUP_APPUNLOAD);
	if (oss.owner)
		return -1;
	return 0;
}

char *description()
{
	return (char *) desc;
}

int usecount()
{
	return usecnt;
}

char *key()
{
	return ASTERISK_GPL_KEY;
}

Index: chan_oss.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_oss.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- chan_oss.c	10 Jul 2005 23:49:57 -0000	1.52
+++ chan_oss.c	3 Aug 2005 04:11:52 -0000	1.53
@@ -1,28 +1,27 @@
 /*
  * Asterisk -- A telephony toolkit for Linux.
  *
- * Use /dev/dsp as a channel, and the console to command it :).
- *
- * The full-duplex "simulation" is pretty weak.  This is generally a 
- * VERY BADLY WRITTEN DRIVER so please don't use it as a model for
- * writing a driver.
- * 
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
[...2046 lines suppressed...]
+			ast_softhangup(o->owner, AST_SOFTHANGUP_APPUNLOAD);
+		if (o->owner) /* XXX how ??? */
+			return -1;
+		/* XXX what about the thread ? */
+		/* XXX what about the memory allocated ? */
 	}
-	if (oss.owner)
-		ast_softhangup(oss.owner, AST_SOFTHANGUP_APPUNLOAD);
-	if (oss.owner)
-		return -1;
 	return 0;
 }
 
 char *description()
 {
-	return (char *) desc;
+	return (char *)oss_tech.description;
 }
 
 int usecount()