[lcd4linux @ 2004-01-20 14:25:12 by reinelt]

some reorganization
moved drv_generic to drv_generic_serial
moved port locking stuff to drv_generic_serial

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@324 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

1 files changed, 0 insertions, 168 deletions

diff --git a/drv_generic.c b/drv_generic.c
deleted file mode 100644
index fbec1e9..0000000
--- a/drv_generic.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* $Id: drv_generic.c,v 1.2 2004/01/20 05:36:59 reinelt Exp $
- *
- * generic driver helper for text- and graphic-based displays
- *
- * Copyright 1999, 2000 Michael Reinelt <reinelt@eunet.at>
- * Copyright 2004 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
- *
- * This file is part of LCD4Linux.
- *
- * LCD4Linux is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * LCD4Linux 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- * $Log: drv_generic.c,v $
- * Revision 1.2  2004/01/20 05:36:59  reinelt
- * moved text-display-specific stuff to drv_generic_text
- * moved all the bar stuff from drv_generic_bar to generic_text
- *
- * Revision 1.1  2004/01/20 04:51:39  reinelt
- * moved generic stuff from drv_MatrixOrbital to drv_generic
- * implemented new-stylish bars which are nearly finished
- *
- */
-
-/* 
- *
- * exported fuctions:
- *
- * Fixme: document me!
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
-
-#include "debug.h"
-#include "cfg.h"
-#include "plugin.h"
-#include "lock.h"
-#include "widget.h"
-#include "widget_text.h"
-#include "widget_bar.h"
-#include "drv.h"
-#include "drv_generic.h"
-
-
-static char   *Driver;
-static char   *Port;
-static speed_t Speed;
-static int     Device=-1;
-
-
-// ****************************************
-// *** generic serial/USB communication ***
-// ****************************************
-
-int drv_generic_serial_open (char *driver, char *port, speed_t speed)
-{
-  int fd;
-  pid_t pid;
-  struct termios portset;
-  
-  Driver = driver;
-  Port   = port;
-  Speed  = speed;
-  
-  if ((pid=lock_port(port))!=0) {
-    if (pid==-1)
-      error ("%s: port %s could not be locked", Driver, Port);
-    else
-      error ("%s: port %s is locked by process %d", Driver, Port, pid);
-    return -1;
-  }
-
-  fd = open(Port, O_RDWR | O_NOCTTY | O_NDELAY); 
-  if (fd==-1) {
-    error ("%s: open(%s) failed: %s", Driver, Port, strerror(errno));
-    unlock_port(Port);
-    return -1;
-  }
-
-  if (tcgetattr(fd, &portset)==-1) {
-    error ("%s: tcgetattr(%s) failed: %s", Driver, Port, strerror(errno));
-    unlock_port(Port);
-    return -1;
-  }
-
-  cfmakeraw(&portset);
-  cfsetospeed(&portset, Speed);
-  if (tcsetattr(fd, TCSANOW, &portset)==-1) {
-    error ("%s: tcsetattr(%s) failed: %s", Driver, Port, strerror(errno));
-    unlock_port(Port);
-    return -1;
-  }
-  
-  Device=fd;
-  return Device;
-}
-
-
-int drv_generic_serial_read (char *string, int len)
-{
-  int run, ret;
-  
-  if (Device==-1) return -1;
-  for (run=0; run<10; run++) {
-    ret=read (Device, string, len);
-    if (ret>=0 || errno!=EAGAIN) break;
-    debug ("read(): EAGAIN");
-    usleep(1000);
-  }
-  
-  if (ret<0) {
-    error("%s: read(%s, %d) failed: %s", Driver, Port, len, strerror(errno));
-  } else if (ret!=len) {
-    error ("%s: partial read: len=%d ret=%d", Driver, len, ret);
-  }
-  
-  return ret;
-}
-
-
-void drv_generic_serial_write (char *string, int len)
-{
-  int run, ret;
-  
-  if (Device==-1) return;
-  for (run=0; run<10; run++) {
-    ret=write (Device, string, len);
-    if (ret>=0 || errno!=EAGAIN) break;
-    debug ("write(): EAGAIN");
-    usleep(1000);
-  }
-  
-  if (ret<0) {
-    error ("MatrixOrbital: write(%s) failed: %s", Port, strerror(errno));
-  } else if (ret!=len) {
-    error ("MatrixOrbital: partial write: len=%d ret=%d", len, ret);
-  }
-  
-  return;
-}
-
-
-int drv_generic_serial_close (void)
-{
-  debug ("%s: closing port %s", Driver, Port);
-  close (Device);
-  unlock_port(Port);
-  return 0;
-}
-