http://marcin-wiacek.fkn.pl/english/zips/mygnokii.tar.gz

[gnokii.git] / common / devices / tekram.c

diff --git a/common/devices/tekram.c b/common/devices/tekram.c
index 21b5b6f..5da6097 100644 (file)
--- a/common/devices/tekram.c
+++ b/common/devices/tekram.c
@@ -6,9 +6,6 @@
  *
  * A Linux/Unix toolset and driver for Nokia mobile phones.
  *
- * Copyright (C) 1999, 2000 Hugh Blemings & Pavel Janík ml.
- * Copyright (C) 2000-2001  Marcel Holtmann <marcel@holtmann.org>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ -23,45 +20,23 @@
  * License along with this library; if not, write to the Free
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Log$
- * Revision 1.1.1.1  2001/11/25 21:59:08  short
- * :pserver:cvs@pserver.samba.org:/cvsroot - gnokii - Sun Nov 25 22:56 CET 2001
- *
- * Revision 1.2  2001/02/21 19:57:03  chris
- * More fiddling with the directory layout
- *
- * Revision 1.1  2001/02/16 14:29:51  chris
- * Restructure of common/.  Fixed a problem in fbus-phonet.c
- * Lots of dprintfs for Marcin
- * Any size xpm can now be loaded (eg for 7110 startup logos)
- * nk7110 code detects 7110/6210 and alters startup logo size to suit
- * Moved Marcin's extended phonebook code into gnokii.c
- *
- * Revision 1.2  2001/02/12 15:13:46  chris
- * Fixed my bug in xgnokii_contacts.c and added <string.h> to tekram.c
- *
- * Revision 1.1  2001/02/09 18:12:53  chris
- * Marcel's tekram support
- *
  */
 
 #include <stdio.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <termios.h>
 #include <string.h>
 
 #ifndef WIN32
-#include "devices/unixserial.h"
+  #include <fcntl.h>
+  #include <sys/ioctl.h>
+  #include <termios.h>
+  #include "devices/unixserial.h"
 #else
-#include "winserial.h"
+  #include <windows.h>
+  #include "devices/winserial.h"
 #endif
 
 #include "devices/tekram.h"
 
-
-
-
 int tekram_open(__const char *__file) {
 
   return (serial_open(__file, O_RDWR | O_NOCTTY | O_NONBLOCK));
@@ -76,18 +51,9 @@ void tekram_close(int __fd) {
 
 void tekram_reset(int __fd) {
 
-  serial_setdtrrts(__fd, 0, 0);
-
-  usleep(50000);
-
-  serial_setdtrrts(__fd, 1, 0);
-
-  usleep(1000);
-
-  serial_setdtrrts(__fd, 1, 1);
-
-  usleep(50);
-
+  serial_setdtrrts(__fd, 0, 0); usleep(50000);
+  serial_setdtrrts(__fd, 1, 0); usleep(1000);
+  serial_setdtrrts(__fd, 1, 1); usleep(50);
 
   serial_changespeed(__fd, 9600);
 }