This commit was manufactured by cvs2svn to create tag

[gnokii.git] / include / devices / device.h

diff --git a/include/devices/device.h b/include/devices/device.h
index f4b4153..92460be 100644 (file)
--- a/include/devices/device.h
+++ b/include/devices/device.h
@@ -22,24 +22,30 @@
    IR (only with 61x0 models) and MBUS (61x0, 640, 6160) */
 typedef enum {
   GCT_FBUS,     /* FBUS connection. */
-#ifndef UCLINUX
   GCT_Infrared, /* FBUS over direct infrared connection - 61xx. */
   GCT_Irda,     /* FBUS over Irda sockets - 7110, 6210, etc. */
   GCT_MBUS,     /* MBUS */
   GCT_DLR3,     /* FBUS over DLR3 cable */
   GCT_Tekram,   /* FBUS over direct infrared connection (Tekram device) - 61xx. */
   GCT_AT,       /* AT commands */
-  GCT_Default   /* Old style module */
-#endif /* UCLINUX */
+  GCT_FBUS3110  /* FBUS version 1 used in N3110 */
 } GSM_ConnectionType;
 
-extern int device_portfd;
-
 #ifndef WIN32
   #include <unistd.h>
   #include "misc.h"
 
+  int device_getfd(void);
+
+  int device_open(__const char *__file, int __with_odd_parity);
+  void device_reset(void);
+
+  size_t device_read(__ptr_t __buf, size_t __nbytes);
   size_t device_write(__const __ptr_t __buf, size_t __n);
+
+  #ifdef DEBUG
+    void device_dumpserial(void);
+  #endif
 #else
   size_t device_write(const __ptr_t __buf, size_t __n);
 #endif
@@ -53,6 +59,5 @@ extern int device_portfd;
 extern char PortDevice[GSM_MAX_DEVICE_NAME_LENGTH];
 
 bool StartConnection (char *port_device, bool with_odd_parity, GSM_ConnectionType con);
-extern void SigHandler(int status);
 
 #endif  /* __device_h */