Changeset 7454

Timestamp:

01/16/08 13:38:04

Author:

eb

Message:

Merged -r7436:7453 eb/freebsd into trunk. This is a part of a set of
patches from Diane Bruce for FreeBSD. Still need to resolve the
issue of where/how to include config.h in all swig code and
how to select wx version on systems with more than one version installed.

Files:

• gnuradio/trunk/configure.ac (modified) (1 diff)
• gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc (modified) (2 diffs)
• gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.h (modified) (3 diffs)
• gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.cc (modified) (2 diffs)
• gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.h (modified) (3 diffs)
• gnuradio/trunk/gnuradio-core/src/lib/io/ppio_ppdev.cc (modified) (4 diffs)

gnuradio/trunk/configure.ac

@@ -126 +126 @@
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h limits.h strings.h time.h sys/ioctl.h sys/time.h unistd.h)
-
+dev/ppbus/ppi.h 
-AC_CHECK_HEADERS(sys/resource.h stdint.h sched.h signal.h sys/syscall.h)
+AC_CHECK_HEADERS(netinet/in.h)
-AC_CHECK_HEADERS(windows.h)
-

gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc

@@ -1 +1 @@
-/* -*- c++ -*- */
-/*
-
+,2008
- * 
- * This file is part of GNU Radio
@@ -21 +21 @@
- */
-
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
-#include <gr_udp_sink.h>
-#include <gr_io_signature.h>

gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.h

@@ -1 +1 @@
-/* -*- c++ -*- */
-/*
-
+,2008
- * 
- * This file is part of GNU Radio
@@ -28 +28 @@
-#include <sys/socket.h>
-#include <arpa/inet.h>
+#include <sys/socket.h>
+#if defined(HAVE_NETINET_IN_H)
+#include <netinet/in.h>
+#endif
-
-class gr_udp_sink;
@@ -71 +75 @@
-  unsigned short d_port_src;        // the port number to open for connections to this service
-  unsigned short d_port_dst;        // port number of the remove system
-
-
+truct s
+truct s
-
- protected:

gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.cc

@@ -1 +1 @@
-/* -*- c++ -*- */
-/*
-
+,2008
- * 
- * This file is part of GNU Radio
@@ -21 +21 @@
- */
-
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
-#include <gr_udp_source.h>
-#include <gr_io_signature.h>

gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.h

@@ -1 +1 @@
-/* -*- c++ -*- */
-/*
-
+,2008
- * 
- * This file is part of GNU Radio
@@ -28 +28 @@
-#include <sys/socket.h>
-#include <arpa/inet.h>
+#if defined(HAVE_NETINET_IN_H)
+#include <netinet/in.h>
+#endif
-
-class gr_udp_source;
@@ -63 +66 @@
-  struct in_addr d_ip_src;        // store the source IP address to use
-  unsigned short d_port_src;      // the port number to open for connections to this service
-
-
+
-  char *d_temp_buff;    // hold buffer between calls
-  ssize_t d_residual;   // hold information about number of bytes stored in the temp buffer

gnuradio/trunk/gnuradio-core/src/lib/io/ppio_ppdev.cc

@@ -1 +1 @@
-/* -*- c++ -*- */
-/*
-
+,2008
- * 
- * This file is part of GNU Radio
@@ -33 +33 @@
-#include <stdio.h>
-#include <stdexcept>
-def HAVE_LINUX_PPDEV_H
+ defined(HAVE_LINUX_PPDEV_H)
-#include <sys/ioctl.h>
-#include <linux/ppdev.h>
-#include <linux/parport.h>
-#include <sstream>
+#elif defined(HAVE_DEV_PPBUS_PPI_H)
+#include <sys/ioctl.h>
+#include <dev/ppbus/ppi.h>
+#include <dev/ppbus/ppbconf.h>
+#include <sstream>
-#else
-// #warn "ppio_ppdev is not functional on this platform"
@@ -54 +59 @@
-static int SP_ACTIVE_LOW_BITS   = 0x80;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-ppio_ppdev::ppio_ppdev (int which)
@@ -213 +168 @@
-}
-
+#elif defined(HAVE_DEV_PPBUS_PPI_H)
+
+// The real FreeBSD code... (Could work on other BSDs as well)
+
+ppio_ppdev::ppio_ppdev (int which)
+{
+  std::ostringstream filename;
+  filename << "/dev/ppi" << which;
+  const char *c_filename = filename.str().c_str();
+  if ((d_fd = open (c_filename, O_RDWR)) < 0){
+    int my_errno = errno;
+    perror (c_filename);
+    throw std::runtime_error ("open");
+  }
+
+#if 0
+  int mode = IEEE1284_MODE_COMPAT;
+  if (ioctl (d_fd, PPSETMODE, &mode) != 0){
+    perror ("ppio_ppdev: PPSETMODE");
+    close (d_fd);
+    throw std::runtime_error ("PPSETMODE");
+  }
+#endif
+}
+
+ppio_ppdev::~ppio_ppdev ()
+{
+  close (d_fd);
+}
+
+
+void 
+ppio_ppdev::write_data (unsigned char v)
+{
+  if (ioctl (d_fd, PPISDATA, &v) != 0){
+    perror ("ppio_ppdev: PPISDATA");
+    throw std::runtime_error ("PPISDATA");
+  }
+}
+
+unsigned char
+ppio_ppdev::read_data ()
+{
+  unsigned char v;
+
+  if (ioctl (d_fd, PPIGDATA, &v) != 0){
+    perror ("ppio_ppdev: PPIGDATA");
+    throw std::runtime_error ("PPIGDATA");
+  }
+  return v;
+}
+
+void 
+ppio_ppdev::write_control (unsigned char v)
+{
+  unsigned char ctrl = v ^ CP_ACTIVE_LOW_BITS;
+  if (ioctl (d_fd, PPISCTRL, &ctrl) != 0){
+    perror ("ppio_ppdev: PPISCTRL");
+    throw std::runtime_error ("PPISCTRL");
+  }
+}
+
+unsigned char
+ppio_ppdev::read_control ()
+{
+  unsigned char ctrl;
+  if (ioctl (d_fd, PPIGCTRL, &ctrl) != 0){
+    perror ("ppio_ppdev: PPIGCTRL");
+    throw std::runtime_error ("PPIGCTRL");
+  }
+
+  return ctrl ^ CP_ACTIVE_LOW_BITS;
+}
+
+unsigned char
+ppio_ppdev::read_status ()
+{
+  unsigned char status;
+  if (ioctl (d_fd, PPIGSTATUS, &status) != 0){
+    perror ("ppio_ppdev: PPIGSTATUS");
+    throw std::runtime_error ("PPIGSTATUS");
+  }
+  return status ^ SP_ACTIVE_LOW_BITS;
+}
+
+void
+ppio_ppdev::lock ()
+{
+}
+
+void
+ppio_ppdev::unlock ()
+{
+}
+#else
+/* Apparently, non real code */
+
+ppio_ppdev::ppio_ppdev (int which)
+{
+  std::cerr << "ppio_ppdev: Not implemented on this platform\n";
+  throw std::runtime_error ("not implmeneted");
+}
+
+ppio_ppdev::~ppio_ppdev ()
+{
+}
+
+void 
+ppio_ppdev::write_data (unsigned char v)
+{
+}
+
+unsigned char
+ppio_ppdev::read_data ()
+{
+  return 0;
+}
+
+void 
+ppio_ppdev::write_control (unsigned char v)
+{
+}
+
+unsigned char
+ppio_ppdev::read_control ()
+{
+  return 0;
+}
+
+unsigned char
+ppio_ppdev::read_status ()
+{
+  return 0;
+}
+
+void
+ppio_ppdev::lock ()
+{
+}
+
+void
+ppio_ppdev::unlock ()
+{
+}
+
-#endif
-