diff options
| author |  Dan Dennedy
| 2008-04-30 14:37:28 -0700 |
|---|---|---|
| committer | Dan Dennedy
| 2008-04-30 14:37:28 -0700 |
| commit | f9681ff59da0acca543ad5d15213c6253114f0ce (patch) | |
| tree | ea1da14c7a5fba1c6c6f1fceff1fb76c25ef8551 /src | |
| parent | libraw1394.sgml, raw1394.h: remove information about deprecated isochronous (diff) | |
Move the source code files in the juju directory into the src directory and
give them 'fw' names instead of 'juju.'
Diffstat (limited to '')
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/dispatch.c | 2 | ||||
| -rw-r--r-- | src/fw-iso.c (renamed from juju/raw1394-iso.c) | 6 | ||||
| -rw-r--r-- | src/fw.c (renamed from juju/raw1394.c) | 4 | ||||
| -rw-r--r-- | src/fw.h (renamed from juju/juju.h) | 10 | ||||
| -rw-r--r-- | src/raw1394_private.h | 2 |
6 files changed, 17 insertions, 15 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 56a0950..a62df10 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,8 @@ lib_LTLIBRARIES = libraw1394.la libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ +INCLUDES = -I$(FW_DIR) + libraw1394_la_SOURCES = \ main.c \ eventloop.c \ @@ -19,9 +21,9 @@ libraw1394_la_SOURCES = \ raw1394_private.h \ ieee1394-ioctl.h \ dispatch.c \ - ../juju/raw1394.c \ - ../juju/raw1394-iso.c \ - ../juju.h + fw.c \ + fw-iso.c \ + fw.h # headers to be installed diff --git a/src/dispatch.c b/src/dispatch.c index cb68ef8..4fe805e 100644 --- a/src/dispatch.c +++ b/src/dispatch.c @@ -14,7 +14,7 @@ #include "csr.h" #include "kernel-raw1394.h" #include "raw1394_private.h" -#include "../juju/juju.h" +#include "fw.h" int raw1394_errcode_to_errno(raw1394_errcode_t errcode) { diff --git a/juju/raw1394-iso.c b/src/fw-iso.c index 9fc8779..471d981 100644 --- a/juju/raw1394-iso.c +++ b/src/fw-iso.c @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 8 -*- * - * raw1394-iso.c -- Emulation of the raw1394 rawiso API on the juju stack + * raw1394-iso.c -- Emulation of the raw1394 rawiso API on the firewire stack * * Copyright (C) 2007 Kristian Hoegsberg <krh@bitplanet.net> * @@ -28,8 +28,8 @@ #include <sys/epoll.h> #include <sys/ioctl.h> -#include "juju.h" -#include "../src/raw1394_private.h" +#include "fw.h" +#include "raw1394_private.h" static int queue_packet(fw_handle_t handle, diff --git a/juju/raw1394.c b/src/fw.c index 73c8705..1322fe2 100644 --- a/juju/raw1394.c +++ b/src/fw.c @@ -31,8 +31,8 @@ #include <errno.h> #include <arpa/inet.h> /* for ntohl and htonl */ -#include "juju.h" -#include "../src/raw1394_private.h" +#include "fw.h" +#include "raw1394_private.h" int fw_errcode_to_errno(raw1394_errcode_t errcode) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 8 -*- * - * juju.h -- Internal header file for raw1394 emulation + * fw.h -- Internal header file for firewire raw1394 emulation * * Copyright (C) 2007 Kristian Hoegsberg <krh@bitplanet.net> * @@ -19,14 +19,14 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __juju_h -#define __juju_h +#ifndef LIBRAW1394_FW_H +#define LIBRAW1394_FW_H #include <stdlib.h> #include <byteswap.h> #include <linux/firewire-cdev.h> -#include "../src/raw1394.h" -#include "../src/csr.h" +#include "raw1394.h" +#include "csr.h" #include "config.h" #define ptr_to_u64(p) ((__u64)(unsigned long)(p)) diff --git a/src/raw1394_private.h b/src/raw1394_private.h index 3f50740..0c8677d 100644 --- a/src/raw1394_private.h +++ b/src/raw1394_private.h @@ -3,7 +3,7 @@ #include "raw1394.h" #include "csr.h" -#include "../juju/juju.h" +#include "fw.h" #include "kernel-raw1394.h" #define HBUF_SIZE 8192 |