add MFC-7840W

ChangeLog

@@ -1,3 +1,6 @@
+2009-01-19  m. allan noah <kitno455 a t gmail d o t com>
+	* doc/descriptions-external/brother2.desc: add MFC-7840W
+
 2009-01-19  Nicolas Martin <nicols-guest at users.alioth.debian.org>
 	* pixma_imageclass.c:
 	Fixed select_source message length, and typo bug in last update.

doc/descriptions-external/brother2.desc

@@ -198,6 +198,12 @@
 :usbid "0x04f9" "0x0181"
 :comment "Network connection reported to work."
 
+:model "MFC-7840W"
+:status :good
+:interface "USB"
+:usbid "0x04f9" "0x01e5"
+:comment "Reported to work with brscan3 driver."
+
 :model "MFC-820CW"
 :status :untested
 :interface "USB"

include/sane/sanei_thread.h

@@ -60,11 +60,7 @@
 #define sanei_thread_h
 #include "../include/sane/config.h"
 
-#ifdef USE_PTHREAD
-typedef long SANE_Pid;
-#else
 typedef int SANE_Pid;
-#endif
 
 /** Initialize sanei_thread.
  *

sanei/sanei_thread.c

@@ -81,6 +81,12 @@
 #include "../include/sane/sanei_debug.h"
 #include "../include/sane/sanei_thread.h"
 
+#ifdef USE_PTHREAD
+typedef pthread_t SANEI_Pid;
+#else
+typedef int SANEI_Pid;
+#endif
+
 #ifndef _VAR_NOT_USED
 # define _VAR_NOT_USED(x)	((x)=(x))
 #endif
@@ -95,6 +101,11 @@ typedef struct {
 
 static ThreadDataDef td;
 
+#define MAX_THREADS 100
+
+/* per-thread information, using the functions' parameters pid as index */
+static SANEI_Pid threads[MAX_THREADS];
+
 /** for init issues - here only for the debug output
  */
 void
@@ -122,14 +133,14 @@ sanei_thread_kill( SANE_Pid pid )
 	DBG(2, "sanei_thread_kill() will kill %ld\n", (long) pid);
 #ifdef USE_PTHREAD
 #if defined (__APPLE__) && defined (__MACH__)
-	return pthread_kill((pthread_t)pid, SIGUSR2);
+	return pthread_kill(threads[pid], SIGUSR2);
 #else
-	return pthread_cancel((pthread_t)pid);
+	return pthread_cancel(threads[pid]);
 #endif
 #elif defined HAVE_OS2_H
-	return DosKillThread(pid);
+	return DosKillThread(threads[pid]);
 #else
-	return kill( pid, SIGTERM );
+	return kill( threads[pid], SIGTERM );
 #endif
 }