[dahdi-commits] kpfleming: tools/trunk r4629 - /tools/trunk/
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Tue Jul 29 17:05:03 CDT 2008
Author: kpfleming
Date: Tue Jul 29 17:05:03 2008
New Revision: 4629
URL: http://svn.digium.com/view/dahdi?view=rev&rev=4629
Log:
build against the new dahdi/user.h (which is now typedef-free!)
Added:
tools/trunk/bittest.h
- copied unchanged from r4627, old/branches/1.4/bittest.h
Modified:
tools/trunk/ (props changed)
tools/trunk/dahdi_cfg.c
tools/trunk/dahdi_tool.c
tools/trunk/hdlcgen.c
tools/trunk/hdlcstress.c
tools/trunk/hdlctest.c
tools/trunk/hdlcverify.c
tools/trunk/patgen.c
tools/trunk/patlooptest.c
tools/trunk/pattest.c
Propchange: tools/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jul 29 17:05:03 2008
@@ -1,27 +1,35 @@
+*.asciidoc
+README.html
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+dahdi_cfg
+dahdi_diag
+dahdi_monitor
+dahdi_scan
+dahdi_speed
+dahdi_test
+dahdi_tool
+foo
+fxotune
+fxstest
+hdlcgen
+hdlcstress
+hdlctest
+hdlcverify
+install-sh
+libtonezone.a
+libtonezone.so
makeopts
-dahdi_cfg
-fxotune
-dahdi_speed
-libtonezone.a
-dahdi_scan
-foo
+menuselect-tree
+menuselect.makedeps
menuselect.makeopts
-config.status
-menuselect.makedeps
-fxstest
+patgen
+patlooptest
+pattest
+sethdlc
+timertest
+tonezones.txt
version.h
-dahdi_monitor
-configure
-config.log
-sethdlc
-dahdi_tool
-dahdi_test
-libtonezone.so
-dahdi_diag
-menuselect-tree
-autom4te.cache
-aclocal.m4
-install-sh
-*.asciidoc
-tonezones.txt
-README.html
Modified: tools/trunk/dahdi_cfg.c
URL: http://svn.digium.com/view/dahdi/tools/trunk/dahdi_cfg.c?view=diff&rev=4629&r1=4628&r2=4629
==============================================================================
--- tools/trunk/dahdi_cfg.c (original)
+++ tools/trunk/dahdi_cfg.c Tue Jul 29 17:05:03 2008
@@ -170,12 +170,12 @@
int ind_ioctl(int channo, int fd, int op, void *data)
{
-DAHDI_INDIRECT_DATA ind;
+ struct dahdi_indirect_data ind;
ind.chan = channo;
ind.op = op;
ind.data = data;
- return ioctl(fd,DAHDI_INDIRECT,&ind);
+ return ioctl(fd, DAHDI_INDIRECT, &ind);
}
static void clear_fields()
Modified: tools/trunk/dahdi_tool.c
URL: http://svn.digium.com/view/dahdi/tools/trunk/dahdi_tool.c?view=diff&rev=4629&r1=4628&r2=4629
==============================================================================
--- tools/trunk/dahdi_tool.c (original)
+++ tools/trunk/dahdi_tool.c Tue Jul 29 17:05:03 2008
@@ -49,7 +49,7 @@
static int ctl = -1;
static int span_max_chan_pos;
-static DAHDI_SPANINFO s[DAHDI_MAX_SPANS];
+static struct dahdi_spaninfo s[DAHDI_MAX_SPANS];
static char *dahdi_txlevelnames[] = {
"0 db (CSU)/0-133 feet (DSX-1)",
@@ -176,7 +176,7 @@
static void show_bits(int span, newtComponent bitbox, newtComponent inuse, newtComponent levels, newtComponent bpvcount,
newtComponent alarms, newtComponent syncsrc, newtComponent irqmisses)
{
- DAHDI_PARAMS zp;
+ struct dahdi_params zp;
int x;
int res;
char c;
@@ -367,7 +367,7 @@
span_max_chan_pos = s[span].totalchans;
for (x=0;x<DAHDI_MAX_CHANNELS;x++) {
- DAHDI_PARAMS zp;
+ struct dahdi_params zp;
int res;
memset(&zp, 0, sizeof(zp));
zp.channo = x;
Modified: tools/trunk/hdlcgen.c
URL: http://svn.digium.com/view/dahdi/tools/trunk/hdlcgen.c?view=diff&rev=4629&r1=4628&r2=4629
==============================================================================
--- tools/trunk/hdlcgen.c (original)
+++ tools/trunk/hdlcgen.c Tue Jul 29 17:05:03 2008
@@ -1,11 +1,12 @@
-#define FAST_HDLC_NEED_TABLES
-#include "kernel/fasthdlc.h"
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
+
+#define FAST_HDLC_NEED_TABLES
+#include <dahdi/fasthdlc.h>
#include "version.h"
Modified: tools/trunk/hdlcstress.c
URL: http://svn.digium.com/view/dahdi/tools/trunk/hdlcstress.c?view=diff&rev=4629&r1=4628&r2=4629
==============================================================================
--- tools/trunk/hdlcstress.c (original)
+++ tools/trunk/hdlcstress.c Tue Jul 29 17:05:03 2008
@@ -9,9 +9,12 @@
#include <unistd.h>
#include <stdlib.h>
#include <dahdi/user.h>
+
+#define FAST_HDLC_NEED_TABLES
+#include <dahdi/fasthdlc.h>
+
#include "bittest.h"
-#define FAST_HDLC_NEED_TABLES
-#include "kernel/fasthdlc.h"
+
#include "version.h"
@@ -115,8 +118,8 @@
int main(int argc, char *argv[])
{
int res, x;
- DAHDI_PARAMS tp;
- DAHDI_BUFFERINFO bi;
+ struct dahdi_params tp;
+ struct dahdi_bufferinfo bi;
int bs = BLOCK_SIZE;
unsigned char c=0;
unsigned char outbuf[BLOCK_SIZE];
Modified: tools/trunk/hdlctest.c
URL: http://svn.digium.com/view/dahdi/tools/trunk/hdlctest.c?view=diff&rev=4629&r1=4628&r2=4629
==============================================================================
--- tools/trunk/hdlctest.c (original)
+++ tools/trunk/hdlctest.c Tue Jul 29 17:05:03 2008
@@ -9,9 +9,11 @@
#include <unistd.h>
#include <stdlib.h>
#include <dahdi/user.h>
+
+#define FAST_HDLC_NEED_TABLES
+#include <dahdi/fasthdlc.h>
+
#include "bittest.h"
-#define FAST_HDLC_NEED_TABLES
-#include "kernel/fasthdlc.h"
#include "version.h"
@@ -133,8 +135,8 @@
{
int fd;
int res, x;
- DAHDI_PARAMS tp;
- DAHDI_BUFFERINFO bi;
+ struct dahdi_params tp;
+ struct dahdi_bufferinfo bi;
int bs = BLOCK_SIZE;
int pos = 0;
unsigned char inbuf[BLOCK_SIZE];
Modified: tools/trunk/hdlcverify.c
URL: http://svn.digium.com/view/dahdi/tools/trunk/hdlcverify.c?view=diff&rev=4629&r1=4628&r2=4629
==============================================================================
--- tools/trunk/hdlcverify.c (original)
+++ tools/trunk/hdlcverify.c Tue Jul 29 17:05:03 2008
@@ -1,11 +1,12 @@
-#define FAST_HDLC_NEED_TABLES
-#include "kernel/fasthdlc.h"
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
+
+#define FAST_HDLC_NEED_TABLES
+#include <dahdi/fasthdlc.h>
#include "version.h"
Modified: tools/trunk/patgen.c
URL: http://svn.digium.com/view/dahdi/tools/trunk/patgen.c?view=diff&rev=4629&r1=4628&r2=4629
==============================================================================
--- tools/trunk/patgen.c (original)
+++ tools/trunk/patgen.c Tue Jul 29 17:05:03 2008
@@ -29,7 +29,7 @@
{
int fd;
int res, res1, x;
- DAHDI_PARAMS tp;
+ struct dahdi_params tp;
int bs = BLOCK_SIZE;
unsigned char c=0;
unsigned char outbuf[BLOCK_SIZE];
@@ -65,7 +65,7 @@
res1 = write(fd, outbuf, res);
if (res1 < res) {
int e;
- DAHDI_SPANINFO zi;
+ struct dahdi_spaninfo zi;
res = ioctl(fd,DAHDI_GETEVENT,&e);
if (res == -1)
{
Modified: tools/trunk/patlooptest.c
URL: http://svn.digium.com/view/dahdi/tools/trunk/patlooptest.c?view=diff&rev=4629&r1=4628&r2=4629
==============================================================================
--- tools/trunk/patlooptest.c (original)
+++ tools/trunk/patlooptest.c Tue Jul 29 17:05:03 2008
@@ -27,7 +27,7 @@
int fd;
int res, x;
int i;
- DAHDI_PARAMS tp;
+ struct dahdi_params tp;
int bs = BLOCK_SIZE;
int skipcount = 10;
unsigned char c=0,c1=0;
Modified: tools/trunk/pattest.c
URL: http://svn.digium.com/view/dahdi/tools/trunk/pattest.c?view=diff&rev=4629&r1=4628&r2=4629
==============================================================================
--- tools/trunk/pattest.c (original)
+++ tools/trunk/pattest.c Tue Jul 29 17:05:03 2008
@@ -28,7 +28,7 @@
{
int fd;
int res, x;
- DAHDI_PARAMS tp;
+ struct dahdi_params tp;
int bs = BLOCK_SIZE;
unsigned char c=0;
unsigned char outbuf[BLOCK_SIZE];
@@ -58,7 +58,7 @@
res = read(fd, outbuf, res);
if (res < bs) {
int e;
- DAHDI_SPANINFO zi;
+ struct dahdi_spaninfo zi;
res = ioctl(fd,DAHDI_GETEVENT,&e);
if (res == -1)
{
More information about the dahdi-commits
mailing list