Changeset 6ef2c11 in mainline for uspace/srv/hid/console

Timestamp:

2010-01-06T20:33:50Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

385a3d6

Parents:

4da7d79 (diff), 23efd30 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/srv/hid/console

Files:

• Makefile (moved) (moved from uspace/srv/console/Makefile ) (1 diff)
• Makefile.build (moved) (moved from uspace/srv/console/Makefile.build ) (1 diff)
• Makefile.common (moved) (moved from uspace/srv/char/i8042/Makefile.common ) (1 diff)
• console.c (moved) (moved from uspace/srv/console/console.c )
• console.h (moved) (moved from uspace/srv/console/console.h )
• gcons.c (moved) (moved from uspace/srv/console/gcons.c )
• gcons.h (moved) (moved from uspace/srv/console/gcons.h )
• gfx/anim_1.ppm (moved) (moved from uspace/srv/console/gfx/anim_1.ppm )
• gfx/anim_2.ppm (moved) (moved from uspace/srv/console/gfx/anim_2.ppm )
• gfx/anim_3.ppm (moved) (moved from uspace/srv/console/gfx/anim_3.ppm )
• gfx/anim_4.ppm (moved) (moved from uspace/srv/console/gfx/anim_4.ppm )
• gfx/cons_has_data.ppm (moved) (moved from uspace/srv/console/gfx/cons_has_data.ppm )
• gfx/cons_idle.ppm (moved) (moved from uspace/srv/console/gfx/cons_idle.ppm )
• gfx/cons_kernel.ppm (moved) (moved from uspace/srv/console/gfx/cons_kernel.ppm )
• gfx/cons_selected.ppm (moved) (moved from uspace/srv/console/gfx/cons_selected.ppm )
• gfx/helenos.ppm (moved) (moved from uspace/srv/console/gfx/helenos.ppm )
• gfx/nameic.ppm (moved) (moved from uspace/srv/console/gfx/nameic.ppm )
• keybuffer.c (moved) (moved from uspace/srv/console/keybuffer.c )
• keybuffer.h (moved) (moved from uspace/srv/console/keybuffer.h )
• screenbuffer.c (moved) (moved from uspace/srv/console/screenbuffer.c )
• screenbuffer.h (moved) (moved from uspace/srv/console/screenbuffer.h )

uspace/srv/hid/console/Makefile

@@ -34 +34 @@
 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build
+        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
         find . -name '*.o' -follow -exec rm \{\} \;

uspace/srv/hid/console/Makefile.build

@@ -71 +71 @@
 %.o: %.c $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
+endif
 
 %.o: %.ppm

uspace/srv/hid/console/Makefile.common

@@ -37 +37 @@
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
-OUTPUT = i8042
+JOB = console.job
+OUTPUT = console