From f562bb6c578f5ff17d9b503ca90cea9e60dd3c57 Mon Sep 17 00:00:00 2001
From: marschap <marschap@users.sourceforge.net>
Date: Thu, 26 May 2005 19:49:01 +0000
Subject: [PATCH] added patch from Lucian Muresan to make irman driver compile
 again (note: nobody said it works ;-)

---
 server/drivers/irmanin.c | 16 ++++++----------
 server/drivers/irmanin.h |  6 ++----
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/server/drivers/irmanin.c b/server/drivers/irmanin.c
index e3b382b..2928cc0 100644
--- a/server/drivers/irmanin.c
+++ b/server/drivers/irmanin.c
@@ -25,7 +25,7 @@
 #include "lcd.h"
 #include "irmanin.h"
 #include "report.h"
-#include "../../../libirman-0.4.1b/irman.h"
+#include "irman.h"
 
 char *progname = "irmanin";
 
@@ -64,7 +64,6 @@ char *codes[] = {
 ////////////////////// Base "class" to derive from ///////////////////////
 //////////////////////////////////////////////////////////////////////////
 
-lcd_logical_driver *irmanin;
 
 //void sigterm(int sig)
 //{
@@ -92,8 +91,6 @@ irmanin_init (Driver *drvthis, char *args)
 	ptrconfig = NULL;
 	ptrdevice = NULL;
 
-	irmanin = drvthis;
-
 	/* Read config file */
 
 	/* What device should be used */
@@ -148,12 +145,11 @@ irmanin_init (Driver *drvthis, char *args)
 }
 
 void
-irmanin_close ()
+irmanin_close (Driver *drvthis)
 {
-	if (irmanin->framebuf != NULL)
-		free (irmanin->framebuf);
-
-	irmanin->framebuf = NULL;
+	//if (drvthis->framebuf != NULL)
+	//	free (drvthis->framebuf);
+	//drvthis->framebuf = NULL;
 
 	ir_free_commands ();
 	ir_finish ();
@@ -165,7 +161,7 @@ irmanin_close ()
 // Return 0 for "nothing available".
 //
 char
-irmanin_getkey ()
+irmanin_getkey (Driver *drvthis)
 {
 	int i;
 	int cmd;
diff --git a/server/drivers/irmanin.h b/server/drivers/irmanin.h
index ff2dbca..a97ce81 100644
--- a/server/drivers/irmanin.h
+++ b/server/drivers/irmanin.h
@@ -1,10 +1,8 @@
 #ifndef LCD_IRMANIN__H
 #define LCD_IRMANIN_H
 
-extern lcd_logical_driver *joy;
-
 MODULE_EXPORT int irmanin_init (Driver *drvthis, char *args);
-MODULE_EXPORT void irmanin_close ();
-MODULE_EXPORT char irmanin_getkey ();
+MODULE_EXPORT void irmanin_close (Driver *drvthis);
+MODULE_EXPORT char irmanin_getkey (Driver *drvthis);
 
 #endif