Fix review comments; add the backend to dll.conf

backend/dll.conf.in

@@ -73,6 +73,7 @@ plustek
 #pnm
 qcam
 ricoh
+ricoh2
 rts8891
 s9036
 sceptre

backend/ricoh2.c

@@ -113,9 +113,9 @@ typedef struct Ricoh2_device_info {
 Ricoh2_device_info;
 
 static Ricoh2_device_info supported_devices[] = {
-  { 0x0448, "Aficio SP111SU"   },
   { 0x042c, "Aficio SP100SU"   },
-  { 0x0438, "Aficio SG3100SNw" }
+  { 0x0438, "Aficio SG3100SNw" },
+  { 0x0448, "Aficio SP111SU"   }
 };
 
 static SANE_String_Const mode_list[] = {

doc/Makefile.in

@@ -416,7 +416,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-nec.5 sane-net.5 sane-pie.5 sane-pieusb.5 sane-pint.5 sane-pnm.5 \
 	sane-umax.5 sane-qcam.5 sane-scsi.5 sane-artec.5 sane-kodak.5 sane-kodakaio.5 \
 	sane-fujitsu.5 sane-sharp.5 sane-s9036.5 sane-tamarack.5 \
-	sane-ricoh.5 sane-ricoh.5 sane-avision.5 sane-plustek.5 sane-st400.5 \
+	sane-ricoh.5 sane-ricoh2.5 sane-avision.5 sane-plustek.5 sane-st400.5 \
 	sane-mustek_pp.5 sane-dc210.5 sane-v4l.5 sane-snapscan.5 \
 	sane-canon.5 sane-coolscan.5 sane-bh.5 sane-dc240.5 \
 	sane-umax_pp.5 sane-umax1220u.5 sane-sm3600.5 sane-usb.5 \

doc/descriptions/ricoh2.desc

@@ -24,22 +24,17 @@
 :mfg "Ricoh"                      ; name a manufacturer
 :url "http://www.ricoh.com/"      ; manufacturer's URL
 
-:model "SP-111SU"                 ; name models for above-specified mfg.
-:status :basic                    ; :minimal, :basic, :good, :complete
-                                  ; :untested, or :unsupported
-:interface "USB"                  ; interface type of the device:
-                                  ; "SCSI", "USB", "Parport (EPP)",
-                                  ; "Parport (SPP)", "Parport (ECP)",
-                                  ; "Serial port", "IEEE-1394", "JetDirect",
-                                  ; or "Proprietary".
-:usbid "0x05ca" "0x0448"          ; Vendor and product ids of an USB device
+:model "SG-3100SNw"
+:status :basic
+:interface "USB"
+:usbid "0x05ca" "0x0438"
 
 :model "SP-100SU"
 :status :untested
 :interface "USB"
 :usbid "0x05ca" "0x042c"
 
-:model "SG-3100SNw"
+:model "SP-111SU"
 :status :basic
 :interface "USB"
-:usbid "0x05ca" "0x0438"
+:usbid "0x05ca" "0x0448"

doc/sane-ricoh2.man

@@ -9,11 +9,11 @@ library implements a SANE (Scanner Access Now Easy) backend that
 provides access to the following Ricoh flatbed scanners:
 .PP
 .RS
+SG-3100SNw
+.br
 SP-100SU
 .br
 SP-111SU
-.br
-SG-3100SNw
 .RE
 .PP
 .SH FILES
@@ -52,6 +52,6 @@ environment variable controls the debug level for this backend. Higher
 debug levels increase the verbosity of the output.
 
 .SH "SEE ALSO"
-sane(7), sane\-scsi(5)
+sane(7), sane\-usb(5)
 .SH AUTHOR
 Stanislav Yuzvinsky

doc/sane.man

@@ -450,7 +450,7 @@ for details.
 .TP
 .B ricoh2
 The ricoh2 backend provides access to the following Ricoh flatbed
-scanners: SP-100SU, SP-111SU, and SG-3100SNw. See
+scanners: SG-3100SNw, SP-100SU, and SP-111SU. See
 .BR sane\-ricoh2 (5)
 for details.
 .TP