Updated plustek backend and manpage

New: multiple device support
     12bit color depth support (with scanimage)
Update: scanner information and manpage

backend/plustek-share.h

@@ -402,7 +402,8 @@ typedef struct {
 #define _OVR_NONE				0
 #define _OVR_PLUSTEK_9630PL		1	/* for legal version of the OP9630	*/
 #define _OVR_PRIMAX_4800D		2	/* for the Primax 4800 Direct		*/
-#define _OVR_PLUSTEK_9636		3	/* for 9636T/P						*/
+#define _OVR_PLUSTEK_9636		3	/* for 9636T/P+/Turbo				*/
+#define _OVR_PLUSTEK_9636P		4	/* for 9636P						*/
 
 #endif	/* guard __PLUSTEK_SHARE_H__ */
 

backend/plustek.c

@@ -18,13 +18,15 @@
  * 0.33 - no changes
  * 0.34 - moved some definitions and typedefs to plustek.h
  * 0.35 - removed Y-correction for 12000P model
- *		  getting Y-size of scan area from driver
+ *        getting Y-size of scan area from driver
  * 0.36 - disabled Dropout, as this does currently not work
  *        enabled Halftone selection only for Halftone-mode
  *        made the cancel button work by using a child process during read
- *		  added version code to driver interface
+ *        added version code to driver interface
- *        cleaned up the code a bit
+ *        cleaned up the code
- *		  fixed sane compatibility problems
+ *        fixed sane compatibility problems
+ *        added multiple device support
+ *        12bit color-depth are now available for scanimage
  *
  *.............................................................................
  *
@@ -98,13 +100,13 @@
 
 /*********************** the debug levels ************************************/
 
-#define _DBG_FATAL  		 0
+#define _DBG_FATAL      0
-#define _DBG_ERROR   		 1
+#define _DBG_ERROR      1
-#define _DBG_WARNING		 3
+#define _DBG_WARNING    3
-#define _DBG_INFO    		 5
+#define _DBG_INFO       5
-#define _DBG_PROC		 	 7
+#define _DBG_PROC       7
-#define _DBG_SANE_INIT		10
+#define _DBG_SANE_INIT 10
-#define _DBG_READ    		15
+#define _DBG_READ      15
 
 /*********************** other definitions ***********************************/
 
@@ -112,14 +114,19 @@
 
 /************************** global vars **************************************/
 
+static int num_devices;
+static Plustek_Device  *first_dev;
+static Plustek_Scanner *first_handle;
+
+
 static ModeParam mode_params[] =
 {
   {0, 1, COLOR_BW},
   {0, 1, COLOR_HALFTONE},
   {0, 8, COLOR_256GRAY},
   {1, 8, COLOR_TRUE24},
-  {1, 10, COLOR_TRUE32},
+  {1, 16, COLOR_TRUE32},
-  {1, 12, COLOR_TRUE36},
+  {1, 16, COLOR_TRUE36},
 };
 
 static ModeParam mode_9636_params[] =
@@ -128,7 +135,7 @@ static ModeParam mode_9636_params[] =
   {0, 1,  COLOR_HALFTONE},
   {0, 8,  COLOR_256GRAY},
   {1, 8,  COLOR_TRUE24},
-  {1, 12, COLOR_TRUE48},
+  {1, 16, COLOR_TRUE48},
 };
 
 static const SANE_String_Const mode_list[] =
@@ -137,7 +144,7 @@ static const SANE_String_Const mode_list[] =
 	"Halftone",
 	"Gray",
 	"Color",
-	"Color32",
+/*	"Color30", */
 	NULL
 };
 
@@ -147,7 +154,7 @@ static const SANE_String_Const mode_9636_list[] =
 	"Halftone",
 	"Gray",
 	"Color",
-	"Color48",
+	"Color36",
 	NULL
 };
 
@@ -188,19 +195,6 @@ static const SANE_Range percentage_range =
  */
 static LensInfo lens = {{0,0,0,0,},{0,0,0,0,},{0,0,0,0,},{0,0,0,0,},0,0};
 
-/*
- * FIXME: currently only one device is supported !
- */
-static Plustek_Device dummy_dev = {
-	{ NULL, "Plustek", NULL, "flatbed scanner" },
-	0, 0, 0, 0,
-	{ 0, 0, 0 },
-	{ 0, 0, 0 },
-	{ 0, 0, 0 },
-	NULL,
- 	0
-};
-
 /*
  * see plustek-share.h
  */
@@ -212,46 +206,47 @@ static SANE_Auth_Callback auth = NULL;
 /*.............................................................................
  * open the driver
  */
-static SANE_Status drvopen(Plustek_Scanner * s, const char *dev_name)
+static int drvopen( const char *dev_name )
 {
 	int 		   result;
+	int			   handle;
 	unsigned short version = _PTDRV_IOCTL_VERSION;
 
     DBG( _DBG_INFO, "drvopen()\n" );
 
-	if ((s->fd = open(dev_name, O_RDONLY)) < 0) {
+	if ((handle = open(dev_name, O_RDONLY)) < 0) {
 	    DBG(_DBG_ERROR, "open: can't open %s as a device\n", dev_name);
-    	return SANE_STATUS_IO_ERROR;
+    	return handle;
 	}
 	
-	result = ioctl(s->fd, _PTDRV_OPEN_DEVICE, &version );
+	result = ioctl(handle, _PTDRV_OPEN_DEVICE, &version );
 	if( result < 0 ) {
+		close( handle );
 		DBG( _DBG_ERROR,"ioctl PT_DRV_OPEN_DEVICE failed(%d)\n", result );
-		return SANE_STATUS_IO_ERROR;
+		return result;
     }
 
-	return SANE_STATUS_GOOD;
+	return handle;
 }
 
 /*.............................................................................
  * close the driver
  */
-static SANE_Status drvclose(Plustek_Scanner * s)
+static SANE_Status drvclose( int handle )
 {
 	int int_cnt;
 
-	if( s->fd >= 0 ) {
+	if( handle >= 0 ) {
 
 	    DBG( _DBG_INFO, "drvclose()\n" );
 		/*
 		 * don't check the return values, simply do it and close the driver
 		 */
 		int_cnt = 0;
-		ioctl(s->fd, _PTDRV_STOP_SCAN, &int_cnt );
+		ioctl( handle, _PTDRV_STOP_SCAN, &int_cnt );
-		ioctl(s->fd, _PTDRV_CLOSE_DEVICE, 0);
+		ioctl( handle, _PTDRV_CLOSE_DEVICE, 0);
 
-		close(s->fd);
+		close( handle );
-		s->fd = -1;
 	}
 
 	return SANE_STATUS_GOOD;
@@ -260,12 +255,13 @@ static SANE_Status drvclose(Plustek_Scanner * s)
 /*.............................................................................
  * according to the mode and source we return the corresponding mode list
  */
-static pModeParam getModeList( Plustek_Scanner *handle )
+static pModeParam getModeList( Plustek_Scanner *scanner )
 {
 	pModeParam mp;
 
-	if((MODEL_OP_9636T  == handle->hw->model) ||
+	if((MODEL_OP_9636T  == scanner->hw->model) ||
-	   (MODEL_OP_9636PP == handle->hw->model)) {
+	   (MODEL_OP_9636P  == scanner->hw->model) ||
+	   (MODEL_OP_9636PP == scanner->hw->model)) {
 		mp = mode_9636_params;	
 	} else {
 		mp = mode_params;	
@@ -274,7 +270,7 @@ static pModeParam getModeList( Plustek_Scanner *handle )
 	/*
 	 * the transparency/negative mode supports only GRAY/COLOR/COLOR32/COLOR48
 	 */
-	if( 0 != handle->val[OPT_EXT_MODE].w )
+	if( 0 != scanner->val[OPT_EXT_MODE].w )
 		mp = &mp[_TPAModeSupportMin];
 
 	return mp;
@@ -342,11 +338,14 @@ static int reader_process( Plustek_Scanner *scanner, int pipe_fd )
 	}
 	
 	/* here we read all data from the driver... */
-	status = (unsigned long)read( scanner->fd, scanner->buf, data_length );
+	status = (unsigned long)read( scanner->hw->fd, scanner->buf, data_length );
 
 	/* on error, there's no need to clean up, as this is done by the parent */
 	if((int)status < 0 ) {
-		DBG( _DBG_ERROR, "read failed, error %i\n", (int)status );
+		DBG( _DBG_ERROR, "read failed, error %i\n", errno );
+		if( errno == EBUSY )
+			return SANE_STATUS_DEVICE_BUSY;
+
 		return SANE_STATUS_IO_ERROR;
     }
 
@@ -378,9 +377,9 @@ static SANE_Status do_cancel( Plustek_Scanner *scanner, SANE_Bool closepipe  )
 		DBG( _DBG_PROC,"killing reader_process\n" );
 
 		/* tell the driver to stop scanning */
-		if( -1 != scanner->fd ) {
+		if( -1 != scanner->hw->fd ) {
 			int_cnt = 1;
-			ioctl(scanner->fd, _PTDRV_STOP_SCAN, &int_cnt );
+			ioctl(scanner->hw->fd, _PTDRV_STOP_SCAN, &int_cnt );
 		}
 
 		/* kill our child process and wait until done */
@@ -399,7 +398,9 @@ static SANE_Status do_cancel( Plustek_Scanner *scanner, SANE_Bool closepipe  )
 		close_pipe( scanner );
 	}
 
-	drvclose( scanner );
+	drvclose( scanner->hw->fd );
+	scanner->hw->fd = -1;
+
 	return SANE_STATUS_CANCELLED;
 }
 
@@ -471,6 +472,7 @@ static SANE_Status init_options( Plustek_Scanner *s )
 	s->opt[OPT_MODE].constraint_type = SANE_CONSTRAINT_STRING_LIST;
 
 	if((MODEL_OP_9636T  == s->hw->model) ||
+	   (MODEL_OP_9636P  == s->hw->model) ||
 	   (MODEL_OP_9636PP == s->hw->model)) {
 		s->opt[OPT_MODE].constraint.string_list = mode_9636_list;
 	} else {
@@ -602,84 +604,88 @@ static SANE_Status init_options( Plustek_Scanner *s )
  */
 static SANE_Status attach( const char *dev_name, Plustek_Device **devp )
 {
-	char 	    	 *str;
+	char 	       *str;
-	int 			 cntr;
+	int 		    cntr;
-	int				 result;
+	int			    result;
-	SANE_Status 	 status;
+	int			    handle;
-	ScannerCaps 	 scaps;
+	SANE_Status	    status;
-	Plustek_Scanner *s = walloca(Plustek_Scanner);
+	Plustek_Device *dev;
-
+	ScannerCaps	    scaps;
-	/* we currently support only one device !!! */
-	s->hw = &dummy_dev;
 
 	DBG(_DBG_SANE_INIT, "attach (%s, %p)\n", dev_name, (void *)devp);
 
+	/* already attached ?*/
+	for( dev = first_dev; dev; dev = dev->next )
+		if (strcmp (dev->sane.name, dev_name) == 0) {
+			if (devp)
+		*devp = dev;
+		return SANE_STATUS_GOOD;
+    }
+
 	/*
 	 * go ahead and open the scanner device
 	 */
-	status = drvopen( s, dev_name );
+	handle = drvopen( dev_name );
-	if (SANE_STATUS_GOOD != status ) {
+	if( handle < 0 ) {
-		return status;
-    }
-
-	result = ioctl(s->fd, _PTDRV_GET_CAPABILITIES, &scaps);
-	if( result < 0 ) {
-		DBG( _DBG_ERROR, "ioctl _PTDRV_GET_CAPABILITIES failed(%d)\n", result);
-		close(s->fd);
 		return SANE_STATUS_IO_ERROR;
     }
 
-	result = ioctl(s->fd, _PTDRV_GET_LENSINFO, &lens);
+	result = ioctl( handle, _PTDRV_GET_CAPABILITIES, &scaps);
+	if( result < 0 ) {
+		DBG( _DBG_ERROR, "ioctl _PTDRV_GET_CAPABILITIES failed(%d)\n", result);
+		close(handle);
+		return SANE_STATUS_IO_ERROR;
+    }
+
+	result = ioctl( handle, _PTDRV_GET_LENSINFO, &lens);
 	if( result < 0 ) {
 		DBG( _DBG_ERROR, "ioctl _PTDRV_GET_LENSINFO failed(%d)\n", result );
-		close(s->fd);
+		close(handle);
 		return SANE_STATUS_IO_ERROR;
 	}
 
 	/* did we fail on connection? */
 	if (scaps.wIOBase == _NO_BASE ) {
 		DBG( _DBG_ERROR, "failed to find Plustek scanner\n" );
-		close(s->fd);
+		close(handle);
 		return SANE_STATUS_INVAL;
     }
 
+	/* allocate some memory for the device */
+	dev = malloc( sizeof (*dev));
+	if (!dev)
+    	return SANE_STATUS_NO_MEM;
+
+	memset (dev, 0, sizeof (*dev));
+
+	dev->fd			 = -1;
+	dev->sane.name   = strdup (dev_name);
+	dev->sane.vendor = "Plustek";
+	dev->sane.type   = "flatbed scanner";
+
+
 	/* save the info we got from the driver */
-	s->hw->model  = scaps.Model;
+	dev->model  = scaps.Model;
-	s->hw->asic   = scaps.AsicID;
+	dev->asic   = scaps.AsicID;
-	s->hw->max_y  = scaps.wMaxExtentY*MM_PER_INCH/_MEASURE_BASE;
+	dev->max_y  = scaps.wMaxExtentY*MM_PER_INCH/_MEASURE_BASE;
 
-	init_options( s );
+	dev->res_list = (SANE_Int *) calloc(((lens.rDpiX.wMax -_DEF_DPI)/25 + 1),
+			     sizeof (SANE_Int));  /* one more to avoid a buffer overflow */
 
-	s->hw->res_list = (SANE_Int *) calloc(((lens.rDpiX.wMax -_DEF_DPI)/25 + 1),
+	if (NULL == dev->res_list) {
-				sizeof (SANE_Int));  /* one more to avoid a buffer overflow */
-
-	if (NULL == s->hw->res_list) {
 		DBG( _DBG_ERROR, "alloc fail, resolution problem\n" );
-		close(s->fd);
+		close(handle);
 		return SANE_STATUS_INVAL;
 	}
 
-	s->hw->res_list_size = 0;
+	dev->res_list_size = 0;
 	for (cntr = _DEF_DPI; cntr <= lens.rDpiX.wMax; cntr += 25) {
-		s->hw->res_list_size++;
+		dev->res_list_size++;
-		s->hw->res_list[s->hw->res_list_size - 1] = (SANE_Int) cntr;
+		dev->res_list[dev->res_list_size - 1] = (SANE_Int) cntr;
 	}
 
-	status = limitResolution( &dummy_dev );
+	status = limitResolution( dev );
-	drvclose( s );
+	drvclose( handle );
-	if (status != SANE_STATUS_GOOD) {
-		DBG( _DBG_ERROR,"attach: device doesn't look like a Plustek scanner\n");
-		close(s->fd);
-		return SANE_STATUS_INVAL;
-	}
-
-	str = malloc(strlen (dev_name) + 1);
-	if( NULL == str ) {
-		close(s->fd);
-		return SANE_STATUS_NO_MEM;
-	}
-
-	dummy_dev.sane.name = strcpy (str, dev_name);
 
 	str = malloc(_MODEL_STR_LEN);
 	if( NULL == str ) {
@@ -697,13 +703,17 @@ static SANE_Status attach( const char *dev_name, Plustek_Device **devp )
 		sprintf (str, ModelStr[scaps.Model]);  /* lookup model string */
 	}
 
-	/* put version in */
+	dev->sane.model = str;
-	sprintf (str + strlen(str), " Driver-Version %d.%d",
+	dev->fd			= handle;
-								scaps.Version >> 8, scaps.Version & 0xff);
 
-	dummy_dev.sane.model = str;
+	DBG( _DBG_SANE_INIT, "attach: model = >%s<\n", dev->sane.model );
 
-	DBG( _DBG_SANE_INIT, "attach: model = >%s<\n", dummy_dev.sane.model );
+	++num_devices;
+	dev->next = first_dev;
+	first_dev = dev;
+
+	if (devp)
+    	*devp = dev;
 
 	return SANE_STATUS_GOOD;
 }
@@ -724,7 +734,6 @@ static SANE_Status attach_one( const char *dev )
 SANE_Status sane_init( SANE_Int *version_code, SANE_Auth_Callback authorize )
 {
 	char   dev_name[PATH_MAX] = "/dev/pt_drv";
-	char   line[PATH_MAX];
 	size_t len;
 	FILE  *fp;
 
@@ -734,34 +743,42 @@ SANE_Status sane_init( SANE_Int *version_code, SANE_Auth_Callback authorize )
 	DBG( _DBG_SANE_INIT, "sane_init: " PACKAGE " " VERSION "\n");
 #endif
 
-	auth = authorize;
+	auth         = authorize;
+	first_dev    = NULL;
+	first_handle = NULL;
+	num_devices  = 0;
 
 	if( version_code != NULL )
 		*version_code = SANE_VERSION_CODE(V_MAJOR, V_MINOR, 0);
 
+	fp = sanei_config_open( PLUSTEK_CONFIG_FILE );
+
 	/* default to /dev/pt_drv instead of insisting on config file */
-	if ((fp = sanei_config_open( PLUSTEK_CONFIG_FILE ))) {
+	if( NULL == fp ) {
-
+		return attach("/dev/pt_drv", 0);
-		while (sanei_config_read (line, sizeof (line), fp)) {
-
-			DBG( _DBG_SANE_INIT, "sane_init, >%s<\n", line);
-			if( line[0] == '#')		/* ignore line comments */
-	    		continue;
-			
-			len = strlen (line);
-			if( line[len - 1] == '\n' )
-            	line[--len] = '\0';
-			if( !len)
-            	continue;			/* ignore empty lines */
-
-			DBG( _DBG_SANE_INIT, "sane_init, >%s<\n", line);
-
-		}
-      	fclose (fp);
 	}
 
-/* FIXME: Use this to attach each device ! --> next release */
+#if V_REV >= 3
-	sanei_config_attach_matching_devices( dev_name, attach_one );
+	while (sanei_config_read( dev_name, sizeof(dev_name), fp)) {
+#else
+	while (fgets(dev_name, sizeof(dev_name), fp)) {
+#endif
+
+		DBG( _DBG_SANE_INIT, "sane_init, >%s<\n", dev_name);
+		if( dev_name[0] == '#')		/* ignore line comments */
+    		continue;
+			
+		len = strlen(dev_name);
+		if( dev_name[len - 1] == '\n' )
+           	dev_name[--len] = '\0';
+		if( !len)
+           	continue;			/* ignore empty lines */
+
+		DBG( _DBG_SANE_INIT, "sane_init, >%s<\n", dev_name);
+
+		sanei_config_attach_matching_devices( dev_name, attach_one );
+	}
+   	fclose (fp);
 
 	return SANE_STATUS_GOOD;
 }
@@ -771,18 +788,26 @@ SANE_Status sane_init( SANE_Int *version_code, SANE_Auth_Callback authorize )
  */
 void sane_exit( void )
 {
+	Plustek_Device *dev, *next;
+
 	DBG( _DBG_SANE_INIT, "sane_exit\n" );
 
-	/*
-	 * check pointer, because they're might be NULL
-	 */
-	if( NULL != dummy_dev.sane.model )
-  		free((char *)dummy_dev.sane.model);
 
-	if( NULL != dummy_dev.sane.name )
+	for( dev = first_dev; dev; dev = next ) {
-		free((char *)dummy_dev.sane.name);
+    	next = dev->next;
 
-	auth = NULL;
+		if( dev->sane.name )
+			free ((void *) dev->sane.name);
+
+		if( dev->sane.model )
+			free ((void *) dev->sane.model);
+
+		free (dev);
+	}
+
+	auth         = NULL;
+	first_dev    = NULL;
+	first_handle = NULL;
 }
 
 /*.............................................................................
@@ -791,17 +816,25 @@ void sane_exit( void )
 SANE_Status sane_get_devices (const SANE_Device ***device_list,
 														SANE_Bool local_only )
 {
-	static const SANE_Device *devlist[2];
+	static const SANE_Device **devlist = 0;
-  	int i;
+	Plustek_Device            *dev;
+	int                        i;
 
 	DBG(_DBG_SANE_INIT, "sane_get_devices (%p, %ld)\n", (void *) device_list,
 				       (long) local_only);
-	i = 0;
 
-	if (dummy_dev.sane.name != NULL)
+	/* already called, so cleanup */
-		devlist[i++] = &dummy_dev.sane;
+	if( devlist )
-	
+    	free( devlist );
-	devlist[i] = NULL;
+
+	devlist = malloc((num_devices + 1) * sizeof (devlist[0]));
+	if ( NULL == devlist )
+    	return SANE_STATUS_NO_MEM;
+
+	i = 0;
+	for (dev = first_dev; i < num_devices; dev = dev->next)
+    	devlist[i++] = &dev->sane;
+	devlist[i++] = 0;
 
 	*device_list = devlist;
 	return SANE_STATUS_GOOD;
@@ -812,39 +845,47 @@ SANE_Status sane_get_devices (const SANE_Device ***device_list,
  */
 SANE_Status sane_open( SANE_String_Const devicename, SANE_Handle * handle )
 {
+	SANE_Status      status;
+	Plustek_Device  *dev;
 	Plustek_Scanner *s;
 
 	DBG( _DBG_SANE_INIT, "sane_open\n" );
 
-	/*
+	if (devicename[0]) {
-	 * this might happens, when there´s no scanner at the port...
+    	for (dev = first_dev; dev; dev = dev->next)
-	 */	
+			if (strcmp (dev->sane.name, devicename) == 0)
-	if( NULL == dummy_dev.sane.name )
+				break;
-		return SANE_STATUS_INVAL;
 
-	if (devicename[0] == '\0')
+		if (!dev) {
-    	devicename = dummy_dev.sane.name;
+			status = attach (devicename, &dev);
 
-	if (strcmp (devicename, dummy_dev.sane.name) != 0)
+			if (status != SANE_STATUS_GOOD)
-		return SANE_STATUS_INVAL;
+				return status;
+		}
+	} else {
+		/* empty devicename -> use first device */
+		dev = first_dev;
+	}
 
-	s = calloc( 1, sizeof(Plustek_Scanner));
+	if (!dev)
-	if (s == NULL)
+    	return SANE_STATUS_INVAL;
+
+	s = malloc (sizeof (*s));
+	if (!s)
     	return SANE_STATUS_NO_MEM;
 
-	/*
+	memset(s, 0, sizeof (*s));
-	 * preset the scanner struct
+	s->pipe     = -1;
-	 */
+	s->hw       = dev;
-	memset( s, 0, sizeof(Plustek_Scanner));
-
-	s->fd 	    = -1;
-	s->pipe	    = -1;
-	s->hw 		= &dummy_dev;
 	s->scanning = SANE_FALSE;
 
 	init_options(s);
 
-	*handle = (SANE_Handle)s;
+	/* insert newly opened handle into list of open handles: */
+	s->next      = first_handle;
+	first_handle = s;
+
+	*handle = s;
 	return SANE_STATUS_GOOD;
 }
 
@@ -853,19 +894,37 @@ SANE_Status sane_open( SANE_String_Const devicename, SANE_Handle * handle )
  */
 void sane_close (SANE_Handle handle)
 {
-	Plustek_Scanner *s;
+	Plustek_Scanner *prev, *s;
 
 	DBG( _DBG_SANE_INIT, "sane_close\n" );
 
-	s = (Plustek_Scanner *)handle;
+	/* remove handle from list of open handles: */
+	prev = 0;
+
+	for( s = first_handle; s; s = s->next ) {
+		if( s == handle )
+			break;
+		prev = s;
+	}
+
+	if (!s) {
+    	DBG( _DBG_ERROR, "close: invalid handle %p\n", handle);
+		return;		
+	}
 
 	close_pipe( s );
 
 	if( NULL != s->buf )
 		free(s->buf);
 
-	drvclose( s );
+	drvclose( s->hw->fd );
-	
+	s->hw->fd = -1;
+
+	if (prev)
+    	prev->next = s->next;
+	else
+    	first_handle = s->next;
+
 	free(s);
 }
 
@@ -1069,6 +1128,7 @@ SANE_Status sane_control_option( SANE_Handle handle, SANE_Int option,
 					s->val[OPT_BR_Y].w = SANE_FIX(_DEFAULT_BRY);
 
 					if((MODEL_OP_9636T  == s->hw->model) ||
+					   (MODEL_OP_9636P  == s->hw->model) ||
 					   (MODEL_OP_9636PP == s->hw->model)) {
 						s->opt[OPT_MODE].constraint.string_list = mode_9636_list;
 					} else {
@@ -1209,29 +1269,34 @@ SANE_Status sane_start( SANE_Handle handle )
 	/*
 	 * open the driver and get some information about the scanner
 	 */
-	if (SANE_STATUS_GOOD != (status = drvopen (s, s->hw->sane.name))) {
+	s->hw->fd = drvopen ( s->hw->sane.name );
-		DBG( _DBG_ERROR,"sane_start: open failed: %s\n",sane_strstatus(status));
+	if( s->hw->fd < 0 ) {
-		return status;
+		DBG( _DBG_ERROR,"sane_start: open failed: %d\n", errno );
+
+		if( errno == EBUSY )
+			return SANE_STATUS_DEVICE_BUSY;
+
+		return SANE_STATUS_IO_ERROR;
 	}
 
-	result = ioctl(s->fd, _PTDRV_GET_CAPABILITIES, &scaps);
+	result = ioctl( s->hw->fd, _PTDRV_GET_CAPABILITIES, &scaps);
 	if( result < 0 ) {
 		DBG( _DBG_ERROR, "ioctl _PTDRV_GET_CAPABILITIES failed(%d)\n", result);
-		close(s->fd);
+		close( s->hw->fd );
 		return SANE_STATUS_IO_ERROR;
     }
 	
-	result = ioctl(s->fd, _PTDRV_GET_LENSINFO, &lens);
+	result = ioctl( s->hw->fd, _PTDRV_GET_LENSINFO, &lens);
 	if( result < 0 ) {
 		DBG( _DBG_ERROR, "ioctl _PTDRV_GET_LENSINFO failed(%d)\n", result );
-		close(s->fd);
+		close(s->hw->fd);
 		return SANE_STATUS_IO_ERROR;
     }
 
 	/* did we fail on connection? */
 	if (scaps.wIOBase == _NO_BASE ) {
 		DBG( _DBG_ERROR, "failed to find Plustek scanner\n" );
-		close(s->fd);
+		close(s->hw->fd);
 		return SANE_STATUS_INVAL;
 	}
 
@@ -1275,6 +1340,8 @@ SANE_Status sane_start( SANE_Handle handle )
  */
 	if( COLOR_TRUE48 == scanmode )
 		cb.ucmd.cInf.ImgDef.wBits = OUTPUT_12Bits;
+	else if( COLOR_TRUE32 == scanmode )
+		cb.ucmd.cInf.ImgDef.wBits = OUTPUT_10Bits;
 	else
 		cb.ucmd.cInf.ImgDef.wBits = OUTPUT_8Bits;
 
@@ -1288,17 +1355,17 @@ SANE_Status sane_start( SANE_Handle handle )
 
 	cb.ucmd.cInf.ImgDef.wLens = scaps.wLens;
 
-	result = ioctl(s->fd, _PTDRV_PUT_IMAGEINFO, &cb);
+	result = ioctl( s->hw->fd, _PTDRV_PUT_IMAGEINFO, &cb);
 	if( result < 0 ) {
 		DBG( _DBG_ERROR, "ioctl _PTDRV_PUT_IMAGEINFO failed(%d)\n", result );
-		close(s->fd);
+		close(s->hw->fd);
 		return SANE_STATUS_IO_ERROR;
 	}
 
-	result = ioctl(s->fd, _PTDRV_GET_CROPINFO, &crop);
+	result = ioctl(s->hw->fd, _PTDRV_GET_CROPINFO, &crop);
 	if( result < 0 ) {
 	    DBG( _DBG_ERROR, "ioctl _PTDRV_GET_CROPINFO failed(%d)\n", result );
-	    close(s->fd);
+	    close(s->hw->fd);
     	return SANE_STATUS_IO_ERROR;
     }
 
@@ -1318,6 +1385,8 @@ SANE_Status sane_start( SANE_Handle handle )
 
 	if( COLOR_TRUE48 == scanmode )
 		cb.ucmd.sInf.ImgDef.wBits = OUTPUT_12Bits;
+	else if( COLOR_TRUE32 == scanmode )
+		cb.ucmd.sInf.ImgDef.wBits = OUTPUT_10Bits;
 	else
 		cb.ucmd.sInf.ImgDef.wBits = OUTPUT_8Bits;
 
@@ -1341,17 +1410,17 @@ SANE_Status sane_start( SANE_Handle handle )
 	DBG( _DBG_SANE_INIT, "bright %i contrast %i\n", cb.ucmd.sInf.siBrightness,
 			 									      cb.ucmd.sInf.siContrast);
 
-	result = ioctl(s->fd, _PTDRV_SET_ENV, &cb.ucmd.sInf);
+	result = ioctl(s->hw->fd, _PTDRV_SET_ENV, &cb.ucmd.sInf);
 	if( result < 0 ) {
 		DBG( _DBG_ERROR, "ioctl _PTDRV_SET_ENV failed(%d)\n", result );
-		close(s->fd);
+		close(s->hw->fd);
 		return SANE_STATUS_IO_ERROR;
     }
 
-	result = ioctl(s->fd, _PTDRV_START_SCAN, &start);
+	result = ioctl(s->hw->fd, _PTDRV_START_SCAN, &start);
 	if( result < 0 ) {
 		DBG( _DBG_ERROR, "ioctl _PTDRV_START_SCAN failed(%d)\n", result );
-		close(s->fd);
+		close(s->hw->fd);
 		return SANE_STATUS_IO_ERROR;
     }
 
@@ -1362,7 +1431,7 @@ SANE_Status sane_start( SANE_Handle handle )
 	s->buf = realloc( s->buf, (s->params.lines) * s->params.bytes_per_line );
 	if( NULL == s->buf ) {
 		DBG( _DBG_ERROR, "realloc failed\n" );
-		close(s->fd);
+		close(s->hw->fd);
 		return SANE_STATUS_NO_MEM;
 	}
 
@@ -1375,7 +1444,7 @@ SANE_Status sane_start( SANE_Handle handle )
 	if( pipe(fds) < 0 ) {
 		DBG( _DBG_ERROR, "ERROR: could not create pipe\n" );
 	    s->scanning = SANE_FALSE;
-		close(s->fd);
+		close(s->hw->fd);
 		return SANE_STATUS_IO_ERROR;
 	}
 
@@ -1386,7 +1455,7 @@ SANE_Status sane_start( SANE_Handle handle )
 	if( s->reader_pid < 0 ) {
 		DBG( _DBG_ERROR, "ERROR: could not create child process\n" );
 	    s->scanning = SANE_FALSE;
-		close(s->fd);
+		close(s->hw->fd);
 		return SANE_STATUS_IO_ERROR;
 	}
 
@@ -1450,7 +1519,8 @@ SANE_Status sane_read( SANE_Handle handle, SANE_Byte *data,
 				(unsigned long)(s->params.lines * s->params.bytes_per_line)) {
 				waitpid( s->reader_pid, 0, 0 );
 				s->reader_pid = -1;
-				drvclose(s);
+				drvclose( s->hw->fd );
+				s->hw->fd = -1;
 				return close_pipe(s);
 			}
 
@@ -1467,7 +1537,8 @@ SANE_Status sane_read( SANE_Handle handle, SANE_Byte *data,
 	s->bytes_read += nread;
 
 	if (0 == nread) {
-		drvclose(s);
+		drvclose( s->hw->fd );
+		s->hw->fd = -1;
 		return close_pipe(s);
 	}
 

backend/plustek.conf

@@ -1 +1,9 @@
+# Plustek-SANE Backend configuration file
+#
+# for multiple devices use
+# /dev/pt_drv0
+# /dev/pt_drv1
+# /dev/pt_drv2
+#
+
 /dev/pt_drv

backend/plustek.desc

@@ -56,7 +56,7 @@
 
 :model "OpticPro 9636P"
 :interface "Parport (SPP, EPP)"
-:comment "Not tested, but should work."
+:comment "OK - use driver-switch mov=4"
 
 :model "OpticPro 9636P+/Turbo"
 :interface "Parport (SPP, EPP)"
@@ -68,7 +68,7 @@
 
 :model "OpticPro 12000T"
 :interface "Parport (SPP, EPP)"
-:comment "Not tested, but should work."
+:comment "OK"
 
 :model "OpticPro AI3"
 :interface "Parport"

backend/plustek.h

@@ -26,6 +26,8 @@
  *		  added max_y in struct Plustek_Scan
  * 0.36 - added reader_pid, pipe and bytes_read to struct Plustek_Scanner
  *		  removed unused variables from struct Plustek_Scanner
+ *        moved fd from struct Plustek_Scanner to Plustek_Device
+ *		  added next members to struct Plustek_Scanner and Plustek_Device
  *
  *.............................................................................
  *
@@ -137,18 +139,20 @@ enum {
 #define PLUSTEK_DESC_SCAN_SOURCE \
 "Selects the picture mode."
 
-typedef struct
+typedef struct Plustek_Device
 {
-    SANE_Device sane;
+	struct Plustek_Device *next;
-	SANE_Int	model;
+	int 				   fd;				/* device handle */
-	SANE_Int	asic;
+    SANE_Device 		   sane;
-	SANE_Int	max_y;
+	SANE_Int			   model;
-    SANE_Int 	level;
+	SANE_Int			   asic;
-    SANE_Range 	dpi_range;
+	SANE_Int			   max_y;
-    SANE_Range 	x_range;
+    SANE_Int 			   level;
-    SANE_Range 	y_range;
+    SANE_Range 			   dpi_range;
-    SANE_Int   *res_list;
+    SANE_Range 			   x_range;
-    SANE_Int 	res_list_size;
+    SANE_Range 			   y_range;
+    SANE_Int  		 	  *res_list;
+    SANE_Int 			   res_list_size;
 } Plustek_Device;
 
 typedef union
@@ -158,9 +162,9 @@ typedef union
 	SANE_String s;
 } Option_Value;
 
-typedef struct
+typedef struct Plustek_Scanner
 {
-	int 					fd;
+    struct Plustek_Scanner *next;
     pid_t 					reader_pid;		/* process id of reader          */
     int 					pipe;			/* pipe to reader process        */
 	unsigned long			bytes_read;		/* number of bytes currently read*/

doc/sane-plustek.man

@@ -1,4 +1,4 @@
-.TH sane-plustek 5 "22 July 2000"
+.TH sane-plustek 5 "23 August 2000"
 .IX sane-plustek
 .SH NAME
 sane-plustek - SANE backend for Plustek parallel port flatbed scanners
@@ -18,15 +18,15 @@ Model:                 ASIC: Properties:
 .br
 ---------------------- ----- ------------------------
 .br
-OpticPro 12000P Turbo  98001 600x1200 dpi 36bit 512Kb
-.br
 OpticPro 9636T/12000T  98001 600x1200 dpi 36bit 512Kb
 .br
+OpticPro 12000P Turbo  98001 600x1200 dpi 36bit 512Kb
+.br
 OpticPro 9636P+/Turbo  98001 600x1200 dpi 36bit 512Kb
 .br
 OpticPro 9636P         98001 600x1200 dpi 36bit 512Kb
 .br
-OpticPro 12000P/96000P 96003 600x1200 dpi 36bit 128Kb
+OpticPro 12000P/96000P 96003 600x1200 dpi 30bit 128Kb
 .br
 OpticPro 9630P/FBIV    96003 600x1200 dpi 30bit 128Kb
 .br
@@ -70,25 +70,39 @@ Colorado 4800               OpticPro 4800   not tested
 .br
 Colorado 4800 Direct        OpticPro 600    mov=2
 .br
-Colorado 4800 Direct 30Bit  OpticPro 4830   not tested
+Colorado 4800 Direct 30bit  OpticPro 4830   not tested
 .br
-Colorado 9600 Direct 30Bit  OpticPro 9630   not tested
+Colorado 9600 Direct 30bit  OpticPro 9630   not tested
 .PP
 
 .SH "DEVICE NAMES"
-This backend expects a device called:
+This backend expects a default device called:
 .PP
 .RS
 .I /dev/pt_drv
 .RE
-This device is currently not part of the SANE distribution. It has to
+.PP
-be downloaded from:
+This default device will be used, if no configuration
+file can be found.
+.PP
+The device-driver is currently not part of the SANE distribution.
+It has to be downloaded from:
 .br
 .B http://home.t-online.de/home/g-jaeger/plustek.html
 .br
 See the INSTALL file there for a proper setup. Currently only Linux
 is supported by this driver (Kernel 2.2.x and higher).
 .PP
+As the backend and the driver support up to four devices
+per system, it is possible to specify them in the configuration
+file
+.PP
+.RS
+.I @CONFIGDIR@/plustek.conf
+.RE
+.PP
+See the plustek.conf file for examples.
+.PP
 
 .SH CONFIGURATION
 .PP
@@ -157,6 +171,15 @@ mov=m
 .br
        transparency/negativ capabilities
 .br
+.I m
+=4 - OpticPro 9636P override (works if OP9636 has
+.br
+       been detected) disables backends
+.br
+       transparency/negativ capabilities
+.br
+       and R/W test during startup
+.br
 .RE
 .PP
 Sample entry for file
@@ -169,6 +192,13 @@ Sample entry for file
 .br
 .I options pt_drv lampoff=180 warmup=15 port=0x378 lOffonEnd=0 mov=0
 .PP
+For multidevice support, simply add values separated by commas to
+the different options
+.br
+.I options pt_drv port=0x378,0x278 mov=0,4
+.PP
+Remember to call depmod after changing /etc/conf.modules.
+.PP
 
 .SH "PARALLEL PORT MODES"
 .PP
@@ -213,10 +243,15 @@ Please send any information and bug-reports to:
 .br
 .B Gerhard Jaeger <g.jaeger@earthling.net>
 .PP
+Additional info and hints can be obtained in our
+.br
+Mailing-List archive at:
+.br
+.B http://www.linuxhacker.org/listscgi-bin/ezmlm-cgi/3
+.PP
 
 .SH "BUGS & RESTRICTIONS"
 .PP
-* The Color36/48-modes are not tested
 .br
 * The Halftoning works, but the quality is poor
 .br
@@ -241,6 +276,8 @@ Please send any information and bug-reports to:
   so scaling is necesary, because the sensor only delivers
 .br
   600dpi but the motor is capable to perform 800dpi steps.
+.br
+* On some devices, the pictures seems to be bluished
 .PP
 ASIC 98001 based models:
 .br
@@ -259,23 +296,17 @@ ASIC 98001 based models:
 * The scanned images seem to be too dark (P9636T)
 .PP
 ASIC 96003/1 based models:
+.br
+  30bit mode is currently not supported.
 .br
 * On low-end systems and under heavy system load, the
 .br
   driver will loosing data, this might causes the sensor
 .br
-  to hit the scan-bed.
+  to hit the scan-bed and/or the picture is corrupted.
 .br
 * The scanspeed on 600x1200 dpi models is slow.
 .br
-* The scan area of 600dpi 96003 based models will be
-.br
-  limited by the driver in binary mode for resolutions
-.br
-  below 100 dpi to avoid moving the sensor against the
-.br
-  bed.
-.br