Changeset 14607

Timestamp:

06/16/10 23:19:55 (3 years ago)

Author:

BrainSlayer

Message:

p910nd daemon

Location:

src/router

Files:

• rc/Makefile (modified) (1 diff)
• rc/services.c (modified) (1 diff)
• services/Makefile (modified) (1 diff)
• services/sysinit/sysinit.c (modified) (1 diff)

src/router/rc/Makefile

@@ -355 +355 @@
 ifeq ($(CONFIG_WR1043),y)
 CFLAGS += -DHAVE_WR1043
+endif
+ifeq ($(CONFIG_P910ND),y)
+CFLAGS += -DHAVE_P910ND
 endif
 ifeq ($(CONFIG_DIR615E),y)

src/router/rc/services.c

@@ -480 +480 @@
 {
         void *handle = NULL;
-
+#ifdef HAVE_P910ND
+        handle = startstop_nofree_f("printer", handle);
+#endif
 #ifdef HAVE_AP_SERV
         handle = startstop_nofree_f("apserv", handle);

src/router/services/Makefile

@@ -237 +237 @@
 ifeq ($(CONFIG_P910ND),y)
 CFLAGS_EXTRA += -DHAVE_P910ND
+OBJS += printer.o
 endif
 

src/router/services/sysinit/sysinit.c

@@ -1943 +1943 @@
                         insmod("printer");
                         insmod("usblp");
-#ifdef HAVE_P910ND
-                        sleep(2);       // wait for printers to show up
-                        FILE *test = fopen("/dev/usb/lp0", "rb");
-                        if (!test) {
-                                eval("mknod", "/dev/lp0", "c", "180", "0");
-                                eval("mknod", "/dev/lp1", "c", "180", "1");
-                                eval("mknod", "/dev/lp2", "c", "180", "2");
-                                eval("p910nd", "-f", "/dev/lp0", "0");
-                        } else {
-                                fclose(test);
-                                eval("p910nd", "-f", "/dev/usb/lp0", "0");
-                        }
-#endif
                 }
                 mount("devpts", "/proc/bus/usb", "usbfs", MS_MGC_VAL, NULL);