mirror of git://git.sysmocom.de/ofono
Integrate the multiplexer into the AT chat library
This commit is contained in:
parent
62c0583f67
commit
c9ba0e7df5
14
Makefile.am
14
Makefile.am
|
@ -42,13 +42,12 @@ gisi_sources = gisi/phonet.h gisi/modem.h gisi/netlink.h gisi/netlink.c \
|
||||||
gisi/socket.h gisi/socket.c gisi/client.h gisi/client.c \
|
gisi/socket.h gisi/socket.c gisi/client.h gisi/client.c \
|
||||||
gisi/pep.h gisi/pep.c gisi/pipe.h gisi/pipe.c
|
gisi/pep.h gisi/pep.c gisi/pipe.h gisi/pipe.c
|
||||||
|
|
||||||
gatmux_sources = gatmux/gatmux.h gatmux/gatmux.c \
|
|
||||||
gatmux/gsm0710_p.h gatmux/gsm0710.c
|
|
||||||
|
|
||||||
gatchat_sources = gatchat/gatchat.h gatchat/gatchat.c \
|
gatchat_sources = gatchat/gatchat.h gatchat/gatchat.c \
|
||||||
gatchat/gatresult.h gatchat/gatresult.c \
|
gatchat/gatresult.h gatchat/gatresult.c \
|
||||||
gatchat/gatsyntax.h gatchat/gatsyntax.c \
|
gatchat/gatsyntax.h gatchat/gatsyntax.c \
|
||||||
gatchat/ringbuffer.h gatchat/ringbuffer.c
|
gatchat/ringbuffer.h gatchat/ringbuffer.c \
|
||||||
|
gatchat/gatmux.h gatchat/gatmux.c \
|
||||||
|
gatchat/gsm0710.h gatchat/gsm0710.c
|
||||||
|
|
||||||
udev_files = plugins/ofono.rules
|
udev_files = plugins/ofono.rules
|
||||||
|
|
||||||
|
@ -86,7 +85,7 @@ endif
|
||||||
|
|
||||||
if ATMODEM
|
if ATMODEM
|
||||||
builtin_modules += atmodem
|
builtin_modules += atmodem
|
||||||
builtin_sources += $(gatmux_sources) $(gatchat_sources) \
|
builtin_sources += $(gatchat_sources) \
|
||||||
drivers/atmodem/atmodem.h \
|
drivers/atmodem/atmodem.h \
|
||||||
drivers/atmodem/atmodem.c \
|
drivers/atmodem/atmodem.c \
|
||||||
drivers/atmodem/call-settings.c \
|
drivers/atmodem/call-settings.c \
|
||||||
|
@ -185,8 +184,7 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ \
|
||||||
-DPLUGINDIR=\""$(build_plugindir)"\"
|
-DPLUGINDIR=\""$(build_plugindir)"\"
|
||||||
|
|
||||||
INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/src \
|
INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/src \
|
||||||
-I$(srcdir)/gdbus -I$(srcdir)/gisi \
|
-I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat
|
||||||
-I$(srcdir)/gatmux -I$(srcdir)/gatchat
|
|
||||||
|
|
||||||
doc_files = doc/overview.txt \
|
doc_files = doc/overview.txt \
|
||||||
doc/manager-api.txt doc/modem-api.txt doc/network-api.txt \
|
doc/manager-api.txt doc/modem-api.txt doc/network-api.txt \
|
||||||
|
@ -233,7 +231,7 @@ unit_test_simutil_SOURCES = unit/test-simutil.c src/util.c \
|
||||||
unit_test_simutil_LDADD = @GLIB_LIBS@
|
unit_test_simutil_LDADD = @GLIB_LIBS@
|
||||||
unit_objects += $(unit_test_simutil_OBJECTS)
|
unit_objects += $(unit_test_simutil_OBJECTS)
|
||||||
|
|
||||||
unit_test_mux_SOURCES = unit/test-mux.c gatmux/gsm0710_p.h gatmux/gsm0710.c
|
unit_test_mux_SOURCES = unit/test-mux.c gatchat/gsm0710.h gatchat/gsm0710.c
|
||||||
unit_test_mux_LDADD = @GLIB_LIBS@
|
unit_test_mux_LDADD = @GLIB_LIBS@
|
||||||
unit_objects += $(unit_test_mux_OBJECTS)
|
unit_objects += $(unit_test_mux_OBJECTS)
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* AT multiplexer library with GLib integration
|
* AT chat library with GLib integration
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009 Intel Corporation. All rights reserved.
|
* Copyright (C) 2008-2009 Intel Corporation. All rights reserved.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
#include "gsm0710_p.h"
|
#include "gsm0710.h"
|
||||||
#include "gatmux.h"
|
#include "gatmux.h"
|
||||||
|
|
||||||
struct _GAtMux {
|
struct _GAtMux {
|
|
@ -1,8 +1,8 @@
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* AT multiplexer library with GLib integration
|
* AT chat library with GLib integration
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009 Intel Corporation. All rights reserved.
|
* Copyright (C) 2008-2009 Intel Corporation. All rights reserved.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
* it under the terms of the GNU General Public License version 2 as
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* AT multiplexer library with GLib integration
|
* AT chat library with GLib integration
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009 Intel Corporation. All rights reserved.
|
* Copyright (C) 2009 Intel Corporation. All rights reserved.
|
||||||
* Copyright (C) 2009 Trolltech ASA.
|
* Copyright (C) 2009 Trolltech ASA.
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "gsm0710_p.h"
|
#include "gsm0710.h"
|
||||||
|
|
||||||
/* Frame types and subtypes */
|
/* Frame types and subtypes */
|
||||||
#define GSM0710_OPEN_CHANNEL 0x3F
|
#define GSM0710_OPEN_CHANNEL 0x3F
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* AT multiplexer library with GLib integration
|
* AT chat library with GLib integration
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009 Intel Corporation. All rights reserved.
|
* Copyright (C) 2009 Intel Corporation. All rights reserved.
|
||||||
* Copyright (C) 2009 Trolltech ASA.
|
* Copyright (C) 2009 Trolltech ASA.
|
|
@ -26,7 +26,7 @@
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <glib/gprintf.h>
|
#include <glib/gprintf.h>
|
||||||
|
|
||||||
#include "gsm0710_p.h"
|
#include "gsm0710.h"
|
||||||
|
|
||||||
static void debug_message(struct gsm0710_context *ctx, const char *msg)
|
static void debug_message(struct gsm0710_context *ctx, const char *msg)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue