From eb62663081642eaa813158db4e7407e56bbcd9b3 Mon Sep 17 00:00:00 2001
From: Lutz Mueller <lutz@users.sourceforge.net>
Date: Fri, 26 Oct 2001 07:39:54 +0000
Subject: [PATCH] Remove cruft

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2753 67ed7778-7388-44ab-90cf-0a291f65f57c
---
 frontends/command-line/main.c | 11 ++-------
 include/gphoto2.h             | 46 ++++++++++++++++++++++-------------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/frontends/command-line/main.c b/frontends/command-line/main.c
index 579c92f01..91ed31ed5 100644
--- a/frontends/command-line/main.c
+++ b/frontends/command-line/main.c
@@ -306,16 +306,9 @@ OPTION_CALLBACK (abilities)
         printf("Abilities for camera:            : %s\n",
                 abilities.model);
         printf("Serial port support              : %s\n",
-                SERIAL_SUPPORTED(abilities.port)? "yes":"no");
-        printf("Parallel port support            : %s\n",
-                PARALLEL_SUPPORTED(abilities.port)? "yes":"no");
+		(abilities.port & GP_PORT_SERIAL)? "yes":"no");
         printf("USB support                      : %s\n",
-                USB_SUPPORTED(abilities.port)? "yes":"no");
-        printf("IEEE1394 support                 : %s\n",
-                IEEE1394_SUPPORTED(abilities.port)? "yes":"no");
-        printf("Network support                  : %s\n",
-                NETWORK_SUPPORTED(abilities.port)? "yes":"no");
-
+		(abilities.port & GP_PORT_USB)? "yes":"no");
         if (abilities.speed[0] != 0) {
         printf("Transfer speeds supported        :\n");
                 do {
diff --git a/include/gphoto2.h b/include/gphoto2.h
index 39edb100c..93296d788 100644
--- a/include/gphoto2.h
+++ b/include/gphoto2.h
@@ -1,12 +1,24 @@
-/*      Header file for gPhoto 0.5-Dev
-
-        Author: Scott Fritzinger <scottf@unr.edu>
-
-        This library is covered by the LGPL.
-*/
-
-#ifndef GPHOTO2_H
-#define GPHOTO2_H 1
+/* gphoto2.h: Convenience header for gphoto2
+ *
+ * Copyright (C) 2001 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+#ifndef __GPHOTO2_H__
+#define __GPHOTO2_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,15 +37,12 @@ extern "C" {
 #define CAMLIBS "."
 #endif
 
-#define SERIAL_SUPPORTED(p)     (p & (1 << 0))
-#define PARALLEL_SUPPORTED(p)   (p & (1 << 1))
-#define USB_SUPPORTED(p)        (p & (1 << 2))
-#define IEEE1394_SUPPORTED(p)   (p & (1 << 3))
-#define NETWORK_SUPPORTED(p)    (p & (1 << 4))
-
 #include <gphoto2-port.h>
+#include <gphoto2-port-log.h>
+#include <gphoto2-port-result.h>
+
+#include <gphoto2-result.h>
 #include <gphoto2-camera.h>
-#include <gphoto2-debug.h>
 #include <gphoto2-file.h>
 #include <gphoto2-filesys.h>
 #include <gphoto2-library.h>
@@ -41,9 +50,12 @@ extern "C" {
 #include <gphoto2-setting.h>
 #include <gphoto2-widget.h>
 
+/* DEPRECATED */
+#include <gphoto2-debug.h>
+
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /* __GPHOTO2_H__ */