You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(135) |
Nov
(123) |
Dec
(83) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(244) |
Feb
(72) |
Mar
(221) |
Apr
(91) |
May
(104) |
Jun
(93) |
Jul
(78) |
Aug
(1) |
Sep
(1) |
Oct
(29) |
Nov
(98) |
Dec
(20) |
2003 |
Jan
|
Feb
(21) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(18) |
Sep
(18) |
Oct
(23) |
Nov
(12) |
Dec
(6) |
2004 |
Jan
(2) |
Feb
(32) |
Mar
|
Apr
(12) |
May
(11) |
Jun
(11) |
Jul
|
Aug
(9) |
Sep
|
Oct
(15) |
Nov
|
Dec
|
2005 |
Jan
|
Feb
(2) |
Mar
(11) |
Apr
(6) |
May
(1) |
Jun
(9) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
2006 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2007 |
Jan
|
Feb
(2) |
Mar
|
Apr
(25) |
May
(2) |
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(13) |
Oct
|
Nov
(2) |
Dec
(2) |
2011 |
Jan
|
Feb
|
Mar
(10) |
Apr
(10) |
May
(1) |
Jun
(6) |
Jul
|
Aug
(2) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
From: Aivils S. <ai...@us...> - 2004-02-09 07:34:23
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32333/ruby-2.6/drivers/video Modified Files: fbmem.c Log Message: sync to 2.6.2 Index: fbmem.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/video/fbmem.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- fbmem.c 5 Dec 2003 12:11:21 -0000 1.2 +++ fbmem.c 9 Feb 2004 07:31:07 -0000 1.3 @@ -160,6 +160,8 @@ extern int tcx_setup(char*); extern int leo_init(void); extern int leo_setup(char*); +extern int kyrofb_init(void); +extern int kyrofb_setup(char*); static struct { const char *name; @@ -361,6 +363,9 @@ #ifdef CONFIG_FB_VOODOO1 { "sstfb", sstfb_init, sstfb_setup }, #endif +#ifdef CONFIG_FB_KYRO + { "kyrofb", kyrofb_init, kyrofb_setup }, +#endif /* * Generic drivers that don't use resource management (yet) */ |
From: Aivils S. <ai...@us...> - 2004-02-09 07:34:23
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/input In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32333/ruby-2.6/drivers/input Modified Files: input.c Log Message: sync to 2.6.2 Index: input.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/input/input.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.c 5 Feb 2004 11:53:56 -0000 1.3 +++ input.c 9 Feb 2004 07:31:07 -0000 1.4 @@ -736,15 +736,13 @@ static inline int input_proc_init(void) { return 0; } #endif -struct class input_class = { - .name = "input", -}; +struct class_simple *input_class; static int __init input_init(void) { int retval = -ENOMEM; - class_register(&input_class); + input_class = class_simple_create(THIS_MODULE, "input"); input_proc_init(); retval = register_chrdev(INPUT_MAJOR, "input", &input_fops); if (retval) { @@ -773,7 +771,7 @@ devfs_remove("input"); unregister_chrdev(INPUT_MAJOR, "input"); - class_unregister(&input_class); + class_simple_destroy(input_class); } subsys_initcall(input_init); |
From: Aivils S. <ai...@us...> - 2004-02-09 07:34:23
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/arch/i386/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32333/ruby-2.6/arch/i386/kernel Modified Files: setup.c Log Message: sync to 2.6.2 Index: setup.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/arch/i386/kernel/setup.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- setup.c 5 Feb 2004 11:53:56 -0000 1.5 +++ setup.c 9 Feb 2004 07:31:07 -0000 1.6 @@ -78,13 +78,10 @@ EXPORT_SYMBOL(acpi_disabled); #ifdef CONFIG_ACPI_BOOT - int acpi_irq __initdata = 1; /* enable IRQ */ - int acpi_ht __initdata = 1; /* enable HT */ +extern int __initdata acpi_ht; +int __initdata acpi_force = 0; #endif -int acpi_force __initdata = 0; - - int MCA_bus; /* for MCA, but anyone else can use it if they want */ unsigned int machine_id; @@ -573,7 +570,7 @@ /* "pci=noacpi" disables ACPI interrupt routing */ else if (!memcmp(from, "pci=noacpi", 10)) { - acpi_irq = 0; + acpi_noirq_set(); } #ifdef CONFIG_X86_LOCAL_APIC |
From: Aivils S. <ai...@us...> - 2004-02-09 07:34:22
|
Update of /cvsroot/linuxconsole/ruby In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32333 Added Files: AGAINST-2.6.2 Removed Files: AGAINST-2.6.1 Log Message: sync to 2.6.2 --- NEW FILE: AGAINST-2.6.2 --- --- AGAINST-2.6.1 DELETED --- |
From: Aivils S. <ai...@us...> - 2004-02-09 07:34:22
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32333/ruby-2.6/drivers/char Modified Files: Kconfig Makefile keyboard.c sysrq.c tty_io.c vt.c vt_proc.c Log Message: sync to 2.6.2 Index: Kconfig =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/Kconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Kconfig 14 Nov 2003 17:44:22 -0000 1.4 +++ Kconfig 9 Feb 2004 07:31:07 -0000 1.5 @@ -595,8 +595,6 @@ bool "Support for console on line printer" depends on PC9800_OLDLP -source "drivers/i2c/Kconfig" - menu "Mice" Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 14 Nov 2003 17:44:22 -0000 1.5 +++ Makefile 9 Feb 2004 07:31:07 -0000 1.6 @@ -43,6 +43,7 @@ obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o obj-$(CONFIG_RAW_DRIVER) += raw.o obj-$(CONFIG_SGI_L1_SERIAL) += sn_serial.o +obj-$(CONFIG_VIOCONS) += viocons.o obj-$(CONFIG_PRINTER) += lp.o obj-$(CONFIG_TIPAR) += tipar.o Index: keyboard.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/keyboard.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- keyboard.c 5 Feb 2004 11:53:56 -0000 1.11 +++ keyboard.c 9 Feb 2004 07:31:07 -0000 1.12 @@ -889,7 +889,7 @@ } } -#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) +#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) || defined(CONFIG_SH_MPC1211) static unsigned short x86_keycodes[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, @@ -897,14 +897,14 @@ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 93, 86, 87, 88, 94, 95, 85,259,375,260, 90, - 284,285,309,311,312, 91,327,328,329,331,333,335,336,337,338,339, - 367,288,302,304,350, 89,334,326,116,377,109,111,126,347,348,349, - 360,261,262,263,298,376,100,101,321,316,373,286,289,102,351,355, + 80, 81, 82, 83, 84,118, 86, 87, 88,115,120,119,121,112,123, 92, + 284,285,309,298,312, 91,327,328,329,331,333,335,336,337,338,339, + 367,288,302,304,350, 89,334,326,267,126,268,269,125,347,348,349, + 360,261,262,263,268,376,100,101,321,316,373,286,289,102,351,355, 103,104,105,275,287,279,306,106,274,107,294,364,358,363,362,361, 291,108,381,281,290,272,292,305,280, 99,112,257,258,359,113,114, - 264,117,271,374,379,115,125,273,121,123, 92,265,266,267,268,269, - 120,119,118,277,278,282,283,295,296,297,299,300,301,293,303,307, + 264,117,271,374,379,265,266, 93, 94, 95, 85,259,375,260, 90,116, + 377,109,111,277,278,282,283,295,296,297,299,300,301,293,303,307, 308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330, 332,340,365,342,343,344,345,346,356,270,341,368,369,370,371,372 }; @@ -934,10 +934,10 @@ put_queue(vc, 0x1d | up_flag); put_queue(vc, 0x45 | up_flag); return 0; - case KEY_LANG1: + case KEY_HANGUEL: if (!up_flag) put_queue(vc, 0xf1); return 0; - case KEY_LANG2: + case KEY_HANJA: if (!up_flag) put_queue(vc, 0xf2); return 0; } Index: sysrq.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/sysrq.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sysrq.c 14 Nov 2003 17:44:22 -0000 1.3 +++ sysrq.c 9 Feb 2004 07:31:07 -0000 1.4 @@ -271,11 +271,11 @@ }; /* key2index calculation, -1 on invalid index */ -static __inline__ int sysrq_key_table_key2index(int key) { +static int sysrq_key_table_key2index(int key) { int retval; - if ((key >= '0') & (key <= '9')) { + if ((key >= '0') && (key <= '9')) { retval = key - '0'; - } else if ((key >= 'a') & (key <= 'z')) { + } else if ((key >= 'a') && (key <= 'z')) { retval = key + 10 - 'a'; } else { retval = -1; Index: tty_io.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/tty_io.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- tty_io.c 14 Nov 2003 17:44:22 -0000 1.6 +++ tty_io.c 9 Feb 2004 07:31:07 -0000 1.7 @@ -1393,7 +1393,7 @@ /* * Need to reset f_op in case a hangup happened. */ - if (filp->f_op == &hung_up_tty_fops) + /*if (filp->f_op == &hung_up_tty_fops) FIXME brave ruby*/ filp->f_op = &tty_fops; goto retry_open; } @@ -2076,79 +2076,7 @@ tty->driver->write(tty, 0, &ch, 1); } -struct tty_dev { - struct list_head node; - dev_t dev; - struct class_device class_dev; -}; -#define to_tty_dev(d) container_of(d, struct tty_dev, class_dev) - -static void release_tty_dev(struct class_device *class_dev) -{ - struct tty_dev *tty_dev = to_tty_dev(class_dev); - kfree(tty_dev); -} - -static struct class tty_class = { - .name = "tty", - .release = &release_tty_dev, -}; - -static LIST_HEAD(tty_dev_list); -static spinlock_t tty_dev_list_lock = SPIN_LOCK_UNLOCKED; - -static ssize_t show_dev(struct class_device *class_dev, char *buf) -{ - struct tty_dev *tty_dev = to_tty_dev(class_dev); - return print_dev_t(buf, tty_dev->dev); -} -static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL); - -static void tty_add_class_device(char *name, dev_t dev, struct device *device) -{ - struct tty_dev *tty_dev = NULL; - int retval; - - tty_dev = kmalloc(sizeof(*tty_dev), GFP_KERNEL); - if (!tty_dev) - return; - memset(tty_dev, 0x00, sizeof(*tty_dev)); - - tty_dev->class_dev.dev = device; - tty_dev->class_dev.class = &tty_class; - snprintf(tty_dev->class_dev.class_id, BUS_ID_SIZE, "%s", name); - retval = class_device_register(&tty_dev->class_dev); - if (retval) - goto error; - class_device_create_file (&tty_dev->class_dev, &class_device_attr_dev); - tty_dev->dev = dev; - spin_lock(&tty_dev_list_lock); - list_add(&tty_dev->node, &tty_dev_list); - spin_unlock(&tty_dev_list_lock); - return; -error: - kfree(tty_dev); -} - -static void tty_remove_class_device(dev_t dev) -{ - struct tty_dev *tty_dev = NULL; - struct list_head *tmp; - int found = 0; - - spin_lock(&tty_dev_list_lock); - list_for_each (tmp, &tty_dev_list) { - tty_dev = list_entry(tmp, struct tty_dev, node); - if (tty_dev->dev == dev) { - list_del(&tty_dev->node); - found = 1; - break; - } - } - spin_unlock(&tty_dev_list_lock); - if (found) - class_device_unregister(&tty_dev->class_dev); -} +static struct class_simple *tty_class; /** * tty_register_device - register a tty device @@ -2181,7 +2109,7 @@ if (driver->type != TTY_DRIVER_TYPE_PTY) { char name[64]; tty_line_name(driver, index, name); - tty_add_class_device(name, dev, device); + class_simple_device_add(tty_class, dev, device, name); } } @@ -2196,7 +2124,7 @@ void tty_unregister_device(struct tty_driver *driver, unsigned index) { devfs_remove("%s%d", driver->devfs_name, index + driver->name_base); - tty_remove_class_device(MKDEV(driver->major, driver->minor_start) + index); + class_simple_device_remove(MKDEV(driver->major, driver->minor_start) + index); } EXPORT_SYMBOL(tty_register_device); @@ -2413,7 +2341,10 @@ static int __init tty_class_init(void) { - return class_register(&tty_class); + tty_class = class_simple_create(THIS_MODULE, "tty"); + if (IS_ERR(tty_class)) + return PTR_ERR(tty_class); + return 0; } postcore_initcall(tty_class_init); @@ -2438,7 +2369,7 @@ register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0) panic("Couldn't register /dev/tty driver\n"); devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 0), S_IFCHR|S_IRUGO|S_IWUGO, "tty"); - tty_add_class_device ("tty", MKDEV(TTYAUX_MAJOR, 0), NULL); + class_simple_device_add(tty_class, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty"); strcpy(console_cdev.kobj.name, "dev.console"); cdev_init(&console_cdev, &console_fops); @@ -2446,7 +2377,7 @@ register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0) panic("Couldn't register /dev/console driver\n"); devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 1), S_IFCHR|S_IRUSR|S_IWUSR, "console"); - tty_add_class_device ("console", MKDEV(TTYAUX_MAJOR, 1), NULL); + class_simple_device_add(tty_class, MKDEV(TTYAUX_MAJOR, 1), NULL, "console"); tty_kobj.kset = tty_cdev.kobj.kset; kobject_register(&tty_kobj); @@ -2458,7 +2389,7 @@ register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) panic("Couldn't register /dev/ptmx driver\n"); devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 2), S_IFCHR|S_IRUGO|S_IWUGO, "ptmx"); - tty_add_class_device ("ptmx", MKDEV(TTYAUX_MAJOR, 2), NULL); + class_simple_device_add(tty_class, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx"); #endif #ifdef CONFIG_VT @@ -2468,7 +2399,7 @@ register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) panic("Couldn't register /dev/tty0 driver\n"); devfs_mk_cdev(MKDEV(TTY_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vc/0"); - tty_add_class_device ("tty0", MKDEV(TTY_MAJOR, 0), NULL); + class_simple_device_add(tty_class, MKDEV(TTY_MAJOR, 0), NULL, "tty0"); vty_init(); #endif Index: vt.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/vt.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- vt.c 23 Dec 2003 07:44:02 -0000 1.13 +++ vt.c 9 Feb 2004 07:31:07 -0000 1.14 @@ -206,17 +206,22 @@ sw->con_putc(vc, i, y, x); } -void hide_cursor(struct vc_data *vc) +static void hide_softcursor(struct vc_data *vc) { - if (cons_num == sel_cons) - clear_selection(); if (softcursor_original != -1) { scr_writew(softcursor_original,(u16 *) pos); if (DO_UPDATE) sw->con_putc(vc, softcursor_original, y, x); softcursor_original = -1; } +} + +void hide_cursor(struct vc_data *vc) +{ + if (cons_num == sel_cons) + clear_selection(); sw->con_cursor(vc, CM_ERASE); + hide_softcursor(vc); } void set_cursor(struct vc_data *vc) @@ -1380,7 +1385,7 @@ if (!vc) { vc = vc_allocate(index); if (!vc) - return index; + return -ENODEV; } tty->driver_data = vc; vc->vc_tty = tty; @@ -1401,10 +1406,11 @@ if (!tty || tty->count != 1) return; - vcs_remove_devfs(tty); vc = (struct vc_data *)tty->driver_data; - if (vc) + if (vc) { + vcs_remove_devfs(tty); vc->vc_tty = NULL; + } tty->driver_data = NULL; } @@ -1735,6 +1741,7 @@ /* Now to setup VT */ init_MUTEX(&vt->lock); vt->vt_num = current_vt; + vt->display_desc = (char *)display_desc; vt->first_vc = current_vc; vt->vc_count = vc_count; list_add_tail(&vt->node, &vt_list); @@ -1876,6 +1883,7 @@ return; } vt->vt_sw = csw; + vt->display_desc = (char *)desc; /* Set the VC states to the new default mode */ for (i = 0; i < vt->vc_count; i++) { Index: vt_proc.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/vt_proc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vt_proc.c 23 Dec 2003 07:44:02 -0000 1.3 +++ vt_proc.c 9 Feb 2004 07:31:07 -0000 1.4 @@ -46,6 +46,19 @@ } static int +read_display_desc(char *page, char **start, off_t off, int count, int *eof, void *data) +{ + struct vt_struct *vt = (struct vt_struct*) data; + int len; + + if(!vt) return 0; + + len = sprintf(page, "%s\n", vt->display_desc ? vt->display_desc : ""); + + return generic_read(page, start, off, count, eof, len); +} + +static int read_kbd_phys(char *page, char **start, off_t off, int count, int *eof, void *data) { struct vt_struct *vt = (struct vt_struct*) data; @@ -89,11 +102,15 @@ vt->keyboard = handle; } handle->private = vt; + printk("keyboard: [%s] bound to [%s] vc:%d-%d\n", + handle->dev->name, vt->display_desc, vt->first_vc + 1, + vt->first_vc + vt->vc_count); } return count; } static vt_proc_entry vt_proc_list[] = { + {"display_desc", read_display_desc, 0, 0}, {"keyboard", read_kbd_phys, write_kbd_phys, 0}, {"", 0, 0, 0} }; |
From: Aivils S. <ai...@us...> - 2004-02-05 11:56:29
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/pci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/ruby-2.6/drivers/pci Modified Files: proc.c Log Message: sync to 2.6.1 Index: proc.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/pci/proc.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- proc.c 16 Sep 2003 06:54:42 -0000 1.1 +++ proc.c 5 Feb 2004 11:53:56 -0000 1.2 @@ -33,7 +33,7 @@ { loff_t new = -1; - lock_kernel(); + down(&file->f_dentry->d_inode->i_sem); switch (whence) { case 0: new = off; @@ -45,10 +45,12 @@ new = PCI_CFG_SPACE_SIZE + off; break; } - unlock_kernel(); - if (new < 0 || new > PCI_CFG_SPACE_SIZE) - return -EINVAL; - return (file->f_pos = new); + if (new < 0 || new > PCI_CFG_SPACE_SIZE) + new = -EINVAL; + else + file->f_pos = new; + up(&file->f_dentry->d_inode->i_sem); + return new; } static ssize_t |
From: Aivils S. <ai...@us...> - 2004-02-05 11:56:29
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/ruby-2.6/include/linux Modified Files: console.h input.h kbd_kern.h Log Message: sync to 2.6.1 Index: console.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/console.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- console.h 14 Nov 2003 17:44:23 -0000 1.2 +++ console.h 5 Feb 2004 11:53:56 -0000 1.3 @@ -18,18 +18,6 @@ #include <linux/spinlock.h> /* - * Array of consoles built from command line options (console=) - */ -struct console_cmdline -{ - char name[8]; /* Name of the driver */ - int index; /* Minor dev. to use */ - char *options; /* Options for the driver */ -}; -#define MAX_CMDLINECONSOLES 8 -extern struct console_cmdline console_list[MAX_CMDLINECONSOLES]; - -/* * The interface for a console, or any other device that * wants to capture console messages (printer driver?) */ @@ -53,6 +41,7 @@ struct console *next; }; +extern int add_preferred_console(char *name, int idx, char *options); extern void register_console(struct console *); extern int unregister_console(struct console *); extern struct console *console_drivers; Index: input.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/input.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- input.h 2 Oct 2003 09:32:19 -0000 1.2 +++ input.h 5 Feb 2004 11:53:56 -0000 1.3 @@ -870,6 +870,7 @@ char *name; struct input_device_id *id_table; + struct input_device_id *blacklist; struct list_head h_list; struct list_head node; Index: kbd_kern.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/kbd_kern.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kbd_kern.h 12 Sep 2003 08:33:21 -0000 1.2 +++ kbd_kern.h 5 Feb 2004 11:53:56 -0000 1.3 @@ -5,6 +5,7 @@ #include <linux/kd.h> #include <linux/interrupt.h> #include <linux/keyboard.h> +#include <linux/input.h> extern struct tasklet_struct keyboard_tasklet; |
From: Aivils S. <ai...@us...> - 2004-02-05 11:56:29
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/ruby-2.6 Modified Files: Makefile Log Message: sync to 2.6.1 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 23 Dec 2003 08:08:01 -0000 1.4 +++ Makefile 5 Feb 2004 11:53:56 -0000 1.5 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = -ruby # *DOCUMENTATION* @@ -275,7 +275,7 @@ CPPFLAGS := -D__KERNEL__ -Iinclude \ $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) -CFLAGS := -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ +CFLAGS := -Wall -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common AFLAGS := -D__ASSEMBLY__ @@ -431,6 +431,12 @@ # --------------------------------------------------------------------------- +ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE +CFLAGS += -Os +else +CFLAGS += -O2 +endif + ifndef CONFIG_FRAME_POINTER CFLAGS += -fomit-frame-pointer endif @@ -872,7 +878,7 @@ $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version;\ mv -f $(objtree)/.tmp_version $(objtree)/.version; - $(RPM) -ta ../$(KERNELPATH).tar.gz + $(RPM) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz rm ../$(KERNELPATH).tar.gz # Brief documentation of the typical targets used |
From: Aivils S. <ai...@us...> - 2004-02-05 11:56:29
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/input In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/ruby-2.6/drivers/input Modified Files: input.c Log Message: sync to 2.6.1 Index: input.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/input/input.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- input.c 2 Oct 2003 09:32:18 -0000 1.2 +++ input.c 5 Feb 2004 11:53:56 -0000 1.3 @@ -447,9 +447,10 @@ list_add_tail(&dev->node, &input_dev_list); list_for_each_entry(handler, &input_handler_list, node) - if ((id = input_match_device(handler->id_table, dev))) - if ((handle = handler->connect(handler, dev, id))) - input_link_handle(handle); + if (!handler->blacklist || !input_match_device(handler->blacklist, dev)) + if ((id = input_match_device(handler->id_table, dev))) + if ((handle = handler->connect(handler, dev, id))) + input_link_handle(handle); #ifdef CONFIG_HOTPLUG input_call_hotplug("add", dev); @@ -507,9 +508,10 @@ list_add_tail(&handler->node, &input_handler_list); list_for_each_entry(dev, &input_dev_list, node) - if ((id = input_match_device(handler->id_table, dev))) - if ((handle = handler->connect(handler, dev, id))) - input_link_handle(handle); + if (!handler->blacklist || !input_match_device(handler->blacklist, dev)) + if ((id = input_match_device(handler->id_table, dev))) + if ((handle = handler->connect(handler, dev, id))) + input_link_handle(handle); #ifdef CONFIG_PROC_FS input_devices_state++; |
From: Aivils S. <ai...@us...> - 2004-02-05 11:56:29
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/fs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/ruby-2.6/fs Modified Files: compat_ioctl.c Log Message: sync to 2.6.1 Index: compat_ioctl.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/fs/compat_ioctl.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- compat_ioctl.c 14 Nov 2003 17:44:22 -0000 1.4 +++ compat_ioctl.c 5 Feb 2004 11:53:56 -0000 1.5 @@ -63,6 +63,8 @@ #include <linux/ctype.h> #include <linux/ioctl32.h> #include <linux/ncp_fs.h> +#include <linux/i2c.h> +#include <linux/i2c-dev.h> #include <net/sock.h> /* siocdevprivate_ioctl */ #include <net/bluetooth/bluetooth.h> @@ -128,7 +130,7 @@ set_fs (KERNEL_DS); err = sys_ioctl(fd, cmd, (unsigned long)&val); set_fs (old_fs); - if (!err && put_user(val, (u32 *)arg)) + if (!err && put_user(val, (u32 *)compat_ptr(arg))) return -EFAULT; return err; } @@ -136,15 +138,16 @@ static int rw_long(unsigned int fd, unsigned int cmd, unsigned long arg) { mm_segment_t old_fs = get_fs(); + u32 *argptr = compat_ptr(arg); int err; unsigned long val; - if(get_user(val, (u32 *)arg)) + if(get_user(val, argptr)) return -EFAULT; set_fs (KERNEL_DS); err = sys_ioctl(fd, cmd, (unsigned long)&val); set_fs (old_fs); - if (!err && put_user(val, (u32 *)arg)) + if (!err && put_user(val, argptr)) return -EFAULT; return err; } @@ -1706,7 +1709,7 @@ set_fs(old_fs); if (err >= 0) - err = put_user(kuid, (compat_pid_t *)arg); + err = put_user(kuid, (compat_uid_t *)arg); return err; } @@ -2874,6 +2877,105 @@ return err; } + +/* + * I2C layer ioctls + */ + +struct i2c_msg32 { + u16 addr; + u16 flags; + u16 len; + compat_caddr_t buf; +}; + +struct i2c_rdwr_ioctl_data32 { + compat_caddr_t msgs; /* struct i2c_msg __user *msgs */ + u32 nmsgs; +}; + +struct i2c_smbus_ioctl_data32 { + u8 read_write; + u8 command; + u32 size; + compat_caddr_t data; /* union i2c_smbus_data *data */ +}; + +static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct i2c_rdwr_ioctl_data *tdata; + struct i2c_rdwr_ioctl_data32 *udata; + struct i2c_msg *tmsgs; + struct i2c_msg32 *umsgs; + compat_caddr_t datap; + int nmsgs, i; + + tdata = compat_alloc_user_space(sizeof(*tdata)); + if (tdata == NULL) + return -ENOMEM; + if (verify_area(VERIFY_WRITE, tdata, sizeof(*tdata))) + return -EFAULT; + + udata = (struct i2c_rdwr_ioctl_data32 *)compat_ptr(arg); + if (verify_area(VERIFY_READ, udata, sizeof(*udata))) + return -EFAULT; + if (__get_user(nmsgs, &udata->nmsgs) || __put_user(nmsgs, &tdata->nmsgs)) + return -EFAULT; + if (nmsgs > I2C_RDRW_IOCTL_MAX_MSGS) + return -EINVAL; + if (__get_user(datap, &udata->msgs)) + return -EFAULT; + umsgs = (struct i2c_msg32 *)compat_ptr(datap); + if (verify_area(VERIFY_READ, umsgs, sizeof(struct i2c_msg) * nmsgs)) + return -EFAULT; + + tmsgs = compat_alloc_user_space(sizeof(struct i2c_msg) * nmsgs); + if (tmsgs == NULL) + return -ENOMEM; + if (verify_area(VERIFY_WRITE, tmsgs, sizeof(struct i2c_msg) * nmsgs)) + return -EFAULT; + if (__put_user(tmsgs, &tdata->msgs)) + return -ENOMEM; + for (i = 0; i < nmsgs; i++) { + if (__copy_in_user(&tmsgs[i].addr, + &umsgs[i].addr, + 3 * sizeof(u16))) + return -EFAULT; + if (__get_user(datap, &umsgs[i].buf) || + __put_user(compat_ptr(datap), &tmsgs[i].buf)) + return -EFAULT; + } + return sys_ioctl(fd, cmd, (unsigned long)tdata); +} + +static int do_i2c_smbus_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct i2c_smbus_ioctl_data *tdata; + struct i2c_smbus_ioctl_data32 *udata; + compat_caddr_t datap; + + tdata = compat_alloc_user_space(sizeof(*tdata)); + if (tdata == NULL) + return -ENOMEM; + if (verify_area(VERIFY_WRITE, tdata, sizeof(*tdata))) + return -EFAULT; + + udata = (struct i2c_smbus_ioctl_data32 *)compat_ptr(arg); + if (verify_area(VERIFY_READ, udata, sizeof(*udata))) + return -EFAULT; + + if (__copy_in_user(&tdata->read_write, &udata->read_write, 2 * sizeof(u8))) + return -EFAULT; + if (__copy_in_user(&tdata->size, &udata->size, 2 * sizeof(u32))) + return -EFAULT; + if (__get_user(datap, &udata->data) || + __put_user(compat_ptr(datap), &tdata->data)) + return -EFAULT; + + return sys_ioctl(fd, cmd, (unsigned long)tdata); +} + + #undef CODE #endif @@ -2986,7 +3088,7 @@ HANDLE_IOCTL(VIDIOCGFREQ32, do_video_ioctl) HANDLE_IOCTL(VIDIOCSFREQ32, do_video_ioctl) /* One SMB ioctl needs translations. */ -#define SMB_IOC_GETMOUNTUID_32 _IOR('u', 1, compat_pid_t) +#define SMB_IOC_GETMOUNTUID_32 _IOR('u', 1, compat_uid_t) HANDLE_IOCTL(SMB_IOC_GETMOUNTUID_32, do_smb_getmountuid) HANDLE_IOCTL(ATM_GETLINKRATE32, do_atm_ioctl) HANDLE_IOCTL(ATM_GETNAMES32, do_atm_ioctl) @@ -3034,5 +3136,10 @@ HANDLE_IOCTL(USBDEVFS_REAPURB32, do_usbdevfs_reapurb) HANDLE_IOCTL(USBDEVFS_REAPURBNDELAY32, do_usbdevfs_reapurb) HANDLE_IOCTL(USBDEVFS_DISCSIGNAL32, do_usbdevfs_discsignal) +/* i2c */ +HANDLE_IOCTL(I2C_FUNCS, w_long) +HANDLE_IOCTL(I2C_RDWR, do_i2c_rdwr_ioctl) +HANDLE_IOCTL(I2C_SMBUS, do_i2c_smbus_ioctl) + #undef DECLARES #endif |
From: Aivils S. <ai...@us...> - 2004-02-05 11:56:29
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/arch/i386/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/ruby-2.6/arch/i386/kernel Modified Files: setup.c Log Message: sync to 2.6.1 Index: setup.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/arch/i386/kernel/setup.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- setup.c 14 Nov 2003 17:44:22 -0000 1.4 +++ setup.c 5 Feb 2004 11:53:56 -0000 1.5 @@ -32,9 +32,12 @@ #include <linux/initrd.h> #include <linux/bootmem.h> #include <linux/seq_file.h> +#include <linux/console.h> #include <linux/root_dev.h> #include <linux/highmem.h> #include <linux/module.h> +#include <linux/efi.h> +#include <linux/init.h> #include <video/edid.h> #include <asm/e820.h> #include <asm/mpspec.h> @@ -55,6 +58,10 @@ * Machine setup.. */ +#ifdef CONFIG_EFI +int efi_enabled = 0; +#endif + /* cpu data as detected by the assembly code in head.S */ struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 }; /* common cpu data for all cpus */ @@ -143,6 +150,20 @@ unsigned long long current_addr = 0; int i; + if (efi_enabled) { + for (i = 0; i < memmap.nr_map; i++) { + current_addr = memmap.map[i].phys_addr + + (memmap.map[i].num_pages << 12); + if (memmap.map[i].type == EFI_CONVENTIONAL_MEMORY) { + if (current_addr >= size) { + memmap.map[i].num_pages -= + (((current_addr-size) + PAGE_SIZE-1) >> PAGE_SHIFT); + memmap.nr_map = i + 1; + return; + } + } + } + } for (i = 0; i < e820.nr_map; i++) { if (e820.map[i].type == E820_RAM) { current_addr = e820.map[i].addr + e820.map[i].size; @@ -158,17 +179,21 @@ static void __init add_memory_region(unsigned long long start, unsigned long long size, int type) { - int x = e820.nr_map; + int x; - if (x == E820MAX) { - printk(KERN_ERR "Ooops! Too many entries in the memory map!\n"); - return; - } + if (!efi_enabled) { + x = e820.nr_map; - e820.map[x].addr = start; - e820.map[x].size = size; - e820.map[x].type = type; - e820.nr_map++; + if (x == E820MAX) { + printk(KERN_ERR "Ooops! Too many entries in the memory map!\n"); + return; + } + + e820.map[x].addr = start; + e820.map[x].size = size; + e820.map[x].type = type; + e820.nr_map++; + } } /* add_memory_region */ #define E820_DEBUG 1 @@ -445,7 +470,6 @@ static void __init setup_memory_region(void) { char *who = machine_specific_memory_setup(); - printk(KERN_INFO "BIOS-provided physical RAM map:\n"); print_memory_map(who); } /* setup_memory_region */ @@ -583,6 +607,23 @@ } /* + * Callback for efi_memory_walk. + */ +static int __init +efi_find_max_pfn(unsigned long start, unsigned long end, void *arg) +{ + unsigned long *max_pfn = arg, pfn; + + if (start < end) { + pfn = PFN_UP(end -1); + if (pfn > *max_pfn) + *max_pfn = pfn; + } + return 0; +} + + +/* * Find the highest page frame number we have available */ void __init find_max_pfn(void) @@ -590,6 +631,11 @@ int i; max_pfn = 0; + if (efi_enabled) { + efi_memmap_walk(efi_find_max_pfn, &max_pfn); + return; + } + for (i = 0; i < e820.nr_map; i++) { unsigned long start, end; /* RAM? */ @@ -664,6 +710,25 @@ } #ifndef CONFIG_DISCONTIGMEM + +/* + * Free all available memory for boot time allocation. Used + * as a callback function by efi_memory_walk() + */ + +static int __init +free_available_memory(unsigned long start, unsigned long end, void *arg) +{ + /* check max_low_pfn */ + if (start >= ((max_low_pfn + 1) << PAGE_SHIFT)) + return 0; + if (end >= ((max_low_pfn + 1) << PAGE_SHIFT)) + end = (max_low_pfn + 1) << PAGE_SHIFT; + if (start < end) + free_bootmem(start, end - start); + + return 0; +} /* * Register fully available low RAM pages with the bootmem allocator. */ @@ -671,6 +736,10 @@ { int i; + if (efi_enabled) { + efi_memmap_walk(free_available_memory, NULL); + return; + } for (i = 0; i < e820.nr_map; i++) { unsigned long curr_pfn, last_pfn, size; /* @@ -798,9 +867,9 @@ * Request address space for all standard RAM and ROM resources * and also for regions reported as reserved by the e820. */ -static void __init register_memory(unsigned long max_low_pfn) +static void __init +legacy_init_iomem_resources(struct resource *code_resource, struct resource *data_resource) { - unsigned long low_mem_size; int i; probe_roms(); @@ -825,11 +894,26 @@ * so we try it repeatedly and let the resource manager * test it. */ - request_resource(res, &code_resource); - request_resource(res, &data_resource); + request_resource(res, code_resource); + request_resource(res, data_resource); } } +} +/* + * Request address space for all standard resources + */ +static void __init register_memory(unsigned long max_low_pfn) +{ + unsigned long low_mem_size; + int i; + + if (efi_enabled) + efi_initialize_iomem_resources(&code_resource, &data_resource); + else + legacy_init_iomem_resources(&code_resource, &data_resource); + + /* EFI systems may still have VGA */ request_graphics_resource(); /* request I/O space for devices used on all i[345]86 PCs */ @@ -949,6 +1033,13 @@ __setup("noreplacement", noreplacement_setup); +/* + * Determine if we were loaded by an EFI loader. If so, then we have also been + * passed the efi memmap, systab, etc., so we should use these data structures + * for initialization. Note, the efi init code path is determined by the + * global efi_enabled. This allows the same kernel image to be used on existing + * systems (with a traditional BIOS) as well as on EFI systems. + */ void __init setup_arch(char **cmdline_p) { unsigned long max_low_pfn; @@ -957,6 +1048,18 @@ pre_setup_arch_hook(); early_cpu_init(); + /* + * FIXME: This isn't an official loader_type right + * now but does currently work with elilo. + * If we were configured as an EFI kernel, check to make + * sure that we were loaded correctly from elilo and that + * the system table is valid. If not, then initialize normally. + */ +#ifdef CONFIG_EFI + if ((LOADER_TYPE == 0x50) && EFI_SYSTAB) + efi_enabled = 1; +#endif + ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); drive_info = DRIVE_INFO; screen_info = SCREEN_INFO; @@ -978,7 +1081,11 @@ rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0); #endif ARCH_SETUP - setup_memory_region(); + if (efi_enabled) + efi_init(); + else + setup_memory_region(); + copy_edd(); if (!MOUNT_ROOT_RDONLY) @@ -1012,6 +1119,8 @@ #ifdef CONFIG_X86_GENERICARCH generic_apic_probe(*cmdline_p); #endif + if (efi_enabled) + efi_map_memmap(); /* * Parse the ACPI tables for possible boot-time SMP configuration. |
From: Aivils S. <ai...@us...> - 2004-02-05 11:56:29
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/ruby-2.6/drivers/char Modified Files: keyboard.c Log Message: sync to 2.6.1 Index: keyboard.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/keyboard.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- keyboard.c 29 Oct 2003 10:45:27 -0000 1.10 +++ keyboard.c 5 Feb 2004 11:53:56 -0000 1.11 @@ -897,16 +897,16 @@ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 43, 85, 86, 87, 88,115,119,120,121,375,123, 90, - 284,285,309,298,312, 91,327,328,329,331,333,335,336,337,338,339, - 367,288,302,304,350, 92,334,512,116,377,109,111,373,347,348,349, - 360, 93, 94, 95, 98,376,100,101,321,316,354,286,289,102,351,355, + 80, 81, 82, 83, 84, 93, 86, 87, 88, 94, 95, 85,259,375,260, 90, + 284,285,309,311,312, 91,327,328,329,331,333,335,336,337,338,339, + 367,288,302,304,350, 89,334,326,116,377,109,111,126,347,348,349, + 360,261,262,263,298,376,100,101,321,316,373,286,289,102,351,355, 103,104,105,275,287,279,306,106,274,107,294,364,358,363,362,361, - 291,108,381,281,290,272,292,305,280, 99,112,257,258,359,270,114, - 118,117,125,374,379,115,112,125,121,123,264,265,266,267,268,269, - 271,273,276,277,278,282,283,295,296,297,299,300,301,293,303,307, - 308,310,313,314,315,317,318,319,320,357,322,323,324,325,326,330, - 332,340,365,342,343,344,345,346,356,113,341,368,369,370,371,372 }; + 291,108,381,281,290,272,292,305,280, 99,112,257,258,359,113,114, + 264,117,271,374,379,115,125,273,121,123, 92,265,266,267,268,269, + 120,119,118,277,278,282,283,295,296,297,299,300,301,293,303,307, + 308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330, + 332,340,365,342,343,344,345,346,356,270,341,368,369,370,371,372 }; #ifdef CONFIG_MAC_EMUMOUSEBTN extern int mac_hid_mouse_emulate_buttons(int, int, int); @@ -928,11 +928,18 @@ if (keycode > 255 || !x86_keycodes[keycode]) return -1; - if (keycode == KEY_PAUSE) { - put_queue(vc, 0xe1); - put_queue(vc, 0x1d | up_flag); - put_queue(vc, 0x45 | up_flag); - return 0; + switch (keycode) { + case KEY_PAUSE: + put_queue(vc, 0xe1); + put_queue(vc, 0x1d | up_flag); + put_queue(vc, 0x45 | up_flag); + return 0; + case KEY_LANG1: + if (!up_flag) put_queue(vc, 0xf1); + return 0; + case KEY_LANG2: + if (!up_flag) put_queue(vc, 0xf2); + return 0; } if (keycode == KEY_SYSRQ && sysrq_alt) { |
From: Aivils S. <ai...@us...> - 2004-02-05 11:56:29
|
Update of /cvsroot/linuxconsole/ruby In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114 Added Files: AGAINST-2.6.1 Removed Files: AGAINST-2.6.0 Log Message: sync to 2.6.1 --- NEW FILE: AGAINST-2.6.1 --- --- AGAINST-2.6.0 DELETED --- |
From: Vojtech P. <vo...@us...> - 2004-01-27 20:17:10
|
Update of /cvsroot/linuxconsole/ruby/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12670 Modified Files: jstest.c Log Message: Use return instead of exit() - it's more portable. Index: jstest.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/utils/jstest.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- jstest.c 8 Oct 2002 10:55:35 -0000 1.5 +++ jstest.c 27 Jan 2004 20:15:59 -0000 1.6 @@ -67,11 +67,11 @@ puts(" --nonblock Same as --event, in nonblocking mode"); puts(" --select Same as --event, using select() call"); puts(""); - exit(1); + return 1; } if ((fd = open(argv[argc - 1], O_RDONLY)) < 0) { perror("jstest"); - exit(1); + return 1; } ioctl(fd, JSIOCGVERSION, &version); @@ -95,7 +95,7 @@ if (read(fd, &js, JS_RETURN) != JS_RETURN) { perror("\njstest: error reading"); - exit(1); + return 1; } printf("Axes: X:%3d Y:%3d Buttons: A:%s B:%s\r", @@ -124,7 +124,7 @@ while (1) { if (read(fd, &js, sizeof(struct js_event)) != sizeof(struct js_event)) { perror("\njstest: error reading"); - exit (1); + return 1; } switch(js.type & ~JS_EVENT_INIT) { @@ -166,7 +166,7 @@ while (1) { if (read(fd, &js, sizeof(struct js_event)) != sizeof(struct js_event)) { perror("\njstest: error reading"); - exit (1); + return 1; } printf("Event: type %d, time %d, number %d, value %d\n", @@ -195,7 +195,7 @@ if (errno != EAGAIN) { perror("\njstest: error reading"); - exit (1); + return 1; } usleep(10000); @@ -224,7 +224,7 @@ if (read(fd, &js, sizeof(struct js_event)) != sizeof(struct js_event)) { perror("\njstest: error reading"); - exit (1); + return 1; } printf("Event: type %d, time %d, number %d, value %d\n", |
From: Vojtech P. <vo...@us...> - 2004-01-27 20:14:53
|
Update of /cvsroot/linuxconsole/ruby/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12184 Modified Files: evtest.c Log Message: New evtest version, with correct 2.6.2 names. Index: evtest.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/utils/evtest.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- evtest.c 25 Jul 2002 09:51:39 -0000 1.19 +++ evtest.c 27 Jan 2004 20:13:46 -0000 1.20 @@ -26,6 +26,8 @@ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic */ +#include <stdint.h> + #include <linux/input.h> #include <string.h> @@ -33,60 +35,258 @@ #include <unistd.h> #include <stdio.h> -char *events[EV_MAX + 1] = { "Sync", "Key", "Relative", "Absolute", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, NULL, "LED", "Sound", NULL, "Repeat", "ForceFeedback", NULL, "ForceFeedbackStatus"}; -char *keys[KEY_MAX + 1] = { "Reserved", "Esc", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "Minus", "Equal", "Backspace", -"Tab", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "LeftBrace", "RightBrace", "Enter", "LeftControl", "A", "S", "D", "F", "G", -"H", "J", "K", "L", "Semicolon", "Apostrophe", "Grave", "LeftShift", "BackSlash", "Z", "X", "C", "V", "B", "N", "M", "Comma", "Dot", -"Slash", "RightShift", "KPAsterisk", "LeftAlt", "Space", "CapsLock", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", -"NumLock", "ScrollLock", "KP7", "KP8", "KP9", "KPMinus", "KP4", "KP5", "KP6", "KPPlus", "KP1", "KP2", "KP3", "KP0", "KPDot", "103rd", -"F13", "102nd", "F11", "F12", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "KPEnter", "RightCtrl", "KPSlash", "SysRq", -"RightAlt", "LineFeed", "Home", "Up", "PageUp", "Left", "Right", "End", "Down", "PageDown", "Insert", "Delete", "Macro", "Mute", -"VolumeDown", "VolumeUp", "Power", "KPEqual", "KPPlusMinus", "Pause", "F21", "F22", "F23", "F24", "KPComma", "LeftMeta", "RightMeta", -"Compose", "Stop", "Again", "Props", "Undo", "Front", "Copy", "Open", "Paste", "Find", "Cut", "Help", "Menu", "Calc", "Setup", -"Sleep", "WakeUp", "File", "SendFile", "DeleteFile", "X-fer", "Prog1", "Prog2", "WWW", "MSDOS", "Coffee", "Direction", -"CycleWindows", "Mail", "Bookmarks", "Computer", "Back", "Forward", "CloseCD", "EjectCD", "EjectCloseCD", "NextSong", "PlayPause", -"PreviousSong", "StopCD", "Record", "Rewind", "Phone", "ISOKey", "Config", "HomePage", "Refresh", "Exit", "Move", "Edit", "ScrollUp", -"ScrollDown", "KPLeftParenthesis", "KPRightParenthesis", -"International1", "International2", "International3", "International4", "International5", -"International6", "International7", "International8", "International9", -"Language1", "Language2", "Language3", "Language4", "Language5", "Language6", "Language7", "Language8", "Language9", -NULL, -"PlayCD", "PauseCD", "Prog3", "Prog4", "Suspend", "Close", -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -"Btn0", "Btn1", "Btn2", "Btn3", "Btn4", "Btn5", "Btn6", "Btn7", "Btn8", "Btn9", -NULL, NULL, NULL, NULL, NULL, NULL, -"LeftBtn", "RightBtn", "MiddleBtn", "SideBtn", "ExtraBtn", "ForwardBtn", "BackBtn", -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -"Trigger", "ThumbBtn", "ThumbBtn2", "TopBtn", "TopBtn2", "PinkieBtn", -"BaseBtn", "BaseBtn2", "BaseBtn3", "BaseBtn4", "BaseBtn5", "BaseBtn6", -NULL, NULL, NULL, "BtnDead", -"BtnA", "BtnB", "BtnC", "BtnX", "BtnY", "BtnZ", "BtnTL", "BtnTR", "BtnTL2", "BtnTR2", "BtnSelect", "BtnStart", "BtnMode", -"BtnThumbL", "BtnThumbR", NULL, -"ToolPen", "ToolRubber", "ToolBrush", "ToolPencil", "ToolAirbrush", "ToolFinger", "ToolMouse", "ToolLens", NULL, NULL, -"Touch", "Stylus", "Stylus2", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -"Ok", "Select", "Goto", "Clear", "Power2", "Option", "Info", "Time", "Vendor", -"Archive", "Program", "Channel", "Favorites", "EPG", "PVR", "MHP", "Language", -"Title", "Subtitle", "Angle", "Zoom", "Mode", "Keyboard", "Screen", "PC", "TV", -"TV2", "VCR", "VCR2", "Sat", "Sat2", "CD", "Tape", "Radio", "Tuner", "Player", -"Text", "DVD", "Aux", "MP3", "Audio", "Video", "Directory", "List", "Memo", -"Calendar", "Red", "Green", "Yellow", "Blue", "ChannelUp", "ChannelDown", -"First", "Last", "AB", "Next", "Restart", "Slow", "Shuffle", "Break", -"Previous", "Digits", "Teen", "Twen" }; +#ifndef EV_SYN +#define EV_SYN 0 +#endif + +char *events[EV_MAX + 1] = { + [0 ... EV_MAX] = NULL, + [EV_SYN] = "Sync", [EV_KEY] = "Key", + [EV_REL] = "Relative", [EV_ABS] = "Absolute", + [EV_MSC] = "Misc", [EV_LED] = "LED", + [EV_SND] = "Sound", [EV_REP] = "Repeat", + [EV_FF] = "ForceFeedback", [EV_PWR] = "Power", + [EV_FF_STATUS] = "ForceFeedbackStatus", +}; + +char *keys[KEY_MAX + 1] = { + [0 ... KEY_MAX] = NULL, + [KEY_RESERVED] = "Reserved", [KEY_ESC] = "Esc", + [KEY_1] = "1", [KEY_2] = "2", + [KEY_3] = "3", [KEY_4] = "4", + [KEY_5] = "5", [KEY_6] = "6", + [KEY_7] = "7", [KEY_8] = "8", + [KEY_9] = "9", [KEY_0] = "0", + [KEY_MINUS] = "Minus", [KEY_EQUAL] = "Equal", + [KEY_BACKSPACE] = "Backspace", [KEY_TAB] = "Tab", + [KEY_Q] = "Q", [KEY_W] = "W", + [KEY_E] = "E", [KEY_R] = "R", + [KEY_T] = "T", [KEY_Y] = "Y", + [KEY_U] = "U", [KEY_I] = "I", + [KEY_O] = "O", [KEY_P] = "P", + [KEY_LEFTBRACE] = "LeftBrace", [KEY_RIGHTBRACE] = "RightBrace", + [KEY_ENTER] = "Enter", [KEY_LEFTCTRL] = "LeftControl", + [KEY_A] = "A", [KEY_S] = "S", + [KEY_D] = "D", [KEY_F] = "F", + [KEY_G] = "G", [KEY_H] = "H", + [KEY_J] = "J", [KEY_K] = "K", + [KEY_L] = "L", [KEY_SEMICOLON] = "Semicolon", + [KEY_APOSTROPHE] = "Apostrophe", [KEY_GRAVE] = "Grave", + [KEY_LEFTSHIFT] = "LeftShift", [KEY_BACKSLASH] = "BackSlash", + [KEY_Z] = "Z", [KEY_X] = "X", + [KEY_C] = "C", [KEY_V] = "V", + [KEY_B] = "B", [KEY_N] = "N", + [KEY_M] = "M", [KEY_COMMA] = "Comma", + [KEY_DOT] = "Dot", [KEY_SLASH] = "Slash", + [KEY_RIGHTSHIFT] = "RightShift", [KEY_KPASTERISK] = "KPAsterisk", + [KEY_LEFTALT] = "LeftAlt", [KEY_SPACE] = "Space", + [KEY_CAPSLOCK] = "CapsLock", [KEY_F1] = "F1", + [KEY_F2] = "F2", [KEY_F3] = "F3", + [KEY_F4] = "F4", [KEY_F5] = "F5", + [KEY_F6] = "F6", [KEY_F7] = "F7", + [KEY_F8] = "F8", [KEY_F9] = "F9", + [KEY_F10] = "F10", [KEY_NUMLOCK] = "NumLock", + [KEY_SCROLLLOCK] = "ScrollLock", [KEY_KP7] = "KP7", + [KEY_KP8] = "KP8", [KEY_KP9] = "KP9", + [KEY_KPMINUS] = "KPMinus", [KEY_KP4] = "KP4", + [KEY_KP5] = "KP5", [KEY_KP6] = "KP6", + [KEY_KPPLUS] = "KPPlus", [KEY_KP1] = "KP1", + [KEY_KP2] = "KP2", [KEY_KP3] = "KP3", + [KEY_KP0] = "KP0", [KEY_KPDOT] = "KPDot", + [KEY_ZENKAKUHANKAKU] = "Zenkaku/Hankaku", [KEY_102ND] = "102nd", + [KEY_F11] = "F11", [KEY_F12] = "F12", + [KEY_RO] = "RO", [KEY_KATAKANA] = "Katakana", + [KEY_HIRAGANA] = "HIRAGANA", [KEY_HENKAN] = "Henkan", + [KEY_KATAKANAHIRAGANA] = "Katakana/Hiragana", [KEY_MUHENKAN] = "Muhenkan", + [KEY_KPJPCOMMA] = "KPJpComma", [KEY_KPENTER] = "KPEnter", + [KEY_RIGHTCTRL] = "RightCtrl", [KEY_KPSLASH] = "KPSlash", + [KEY_SYSRQ] = "SysRq", [KEY_RIGHTALT] = "RightAlt", + [KEY_LINEFEED] = "LineFeed", [KEY_HOME] = "Home", + [KEY_UP] = "Up", [KEY_PAGEUP] = "PageUp", + [KEY_LEFT] = "Left", [KEY_RIGHT] = "Right", + [KEY_END] = "End", [KEY_DOWN] = "Down", + [KEY_PAGEDOWN] = "PageDown", [KEY_INSERT] = "Insert", + [KEY_DELETE] = "Delete", [KEY_MACRO] = "Macro", + [KEY_MUTE] = "Mute", [KEY_VOLUMEDOWN] = "VolumeDown", + [KEY_VOLUMEUP] = "VolumeUp", [KEY_POWER] = "Power", + [KEY_KPEQUAL] = "KPEqual", [KEY_KPPLUSMINUS] = "KPPlusMinus", + [KEY_PAUSE] = "Pause", [KEY_KPCOMMA] = "KPComma", + [KEY_HANGUEL] = "Hanguel", [KEY_HANJA] = "Hanja", + [KEY_YEN] = "Yen", [KEY_LEFTMETA] = "LeftMeta", + [KEY_RIGHTMETA] = "RightMeta", [KEY_COMPOSE] = "Compose", + [KEY_STOP] = "Stop", [KEY_AGAIN] = "Again", + [KEY_PROPS] = "Props", [KEY_UNDO] = "Undo", + [KEY_FRONT] = "Front", [KEY_COPY] = "Copy", + [KEY_OPEN] = "Open", [KEY_PASTE] = "Paste", + [KEY_FIND] = "Find", [KEY_CUT] = "Cut", + [KEY_HELP] = "Help", [KEY_MENU] = "Menu", + [KEY_CALC] = "Calc", [KEY_SETUP] = "Setup", + [KEY_SLEEP] = "Sleep", [KEY_WAKEUP] = "WakeUp", + [KEY_FILE] = "File", [KEY_SENDFILE] = "SendFile", + [KEY_DELETEFILE] = "DeleteFile", [KEY_XFER] = "X-fer", + [KEY_PROG1] = "Prog1", [KEY_PROG2] = "Prog2", + [KEY_WWW] = "WWW", [KEY_MSDOS] = "MSDOS", + [KEY_COFFEE] = "Coffee", [KEY_DIRECTION] = "Direction", + [KEY_CYCLEWINDOWS] = "CycleWindows", [KEY_MAIL] = "Mail", + [KEY_BOOKMARKS] = "Bookmarks", [KEY_COMPUTER] = "Computer", + [KEY_BACK] = "Back", [KEY_FORWARD] = "Forward", + [KEY_CLOSECD] = "CloseCD", [KEY_EJECTCD] = "EjectCD", + [KEY_EJECTCLOSECD] = "EjectCloseCD", [KEY_NEXTSONG] = "NextSong", + [KEY_PLAYPAUSE] = "PlayPause", [KEY_PREVIOUSSONG] = "PreviousSong", + [KEY_STOPCD] = "StopCD", [KEY_RECORD] = "Record", + [KEY_REWIND] = "Rewind", [KEY_PHONE] = "Phone", + [KEY_ISO] = "ISOKey", [KEY_CONFIG] = "Config", + [KEY_HOMEPAGE] = "HomePage", [KEY_REFRESH] = "Refresh", + [KEY_EXIT] = "Exit", [KEY_MOVE] = "Move", + [KEY_EDIT] = "Edit", [KEY_SCROLLUP] = "ScrollUp", + [KEY_SCROLLDOWN] = "ScrollDown", [KEY_KPLEFTPAREN] = "KPLeftParenthesis", + [KEY_KPRIGHTPAREN] = "KPRightParenthesis", [KEY_F13] = "F13", + [KEY_F14] = "F14", [KEY_F15] = "F15", + [KEY_F16] = "F16", [KEY_F17] = "F17", + [KEY_F18] = "F18", [KEY_F19] = "F19", + [KEY_F20] = "F20", [KEY_F21] = "F21", + [KEY_F22] = "F22", [KEY_F23] = "F23", + [KEY_F24] = "F24", [KEY_PLAYCD] = "PlayCD", + [KEY_PAUSECD] = "PauseCD", [KEY_PROG3] = "Prog3", + [KEY_PROG4] = "Prog4", [KEY_SUSPEND] = "Suspend", + [KEY_CLOSE] = "Close", [KEY_PLAY] = "Play", + [KEY_FASTFORWARD] = "Fast Forward", [KEY_BASSBOOST] = "Bass Boost", + [KEY_PRINT] = "Print", [KEY_HP] = "HP", + [KEY_CAMERA] = "Camera", [KEY_SOUND] = "Sound", + [KEY_QUESTION] = "Question", [KEY_EMAIL] = "Email", + [KEY_CHAT] = "Chat", [KEY_SEARCH] = "Search", + [KEY_CONNECT] = "Connect", [KEY_FINANCE] = "Finance", + [KEY_SPORT] = "Sport", [KEY_SHOP] = "Shop", + [KEY_ALTERASE] = "Alternate Erase", [KEY_CANCEL] = "Cancel", + [KEY_BRIGHTNESSDOWN] = "Brightness down", [KEY_BRIGHTNESSUP] = "Brightness up", + [KEY_MEDIA] = "Media", [KEY_UNKNOWN] = "Unknown", + [BTN_0] = "Btn0", [BTN_1] = "Btn1", + [BTN_2] = "Btn2", [BTN_3] = "Btn3", + [BTN_4] = "Btn4", [BTN_5] = "Btn5", + [BTN_6] = "Btn6", [BTN_7] = "Btn7", + [BTN_8] = "Btn8", [BTN_9] = "Btn9", + [BTN_LEFT] = "LeftBtn", [BTN_RIGHT] = "RightBtn", + [BTN_MIDDLE] = "MiddleBtn", [BTN_SIDE] = "SideBtn", + [BTN_EXTRA] = "ExtraBtn", [BTN_FORWARD] = "ForwardBtn", + [BTN_BACK] = "BackBtn", [BTN_TASK] = "TaskBtn", + [BTN_TRIGGER] = "Trigger", [BTN_THUMB] = "ThumbBtn", + [BTN_THUMB2] = "ThumbBtn2", [BTN_TOP] = "TopBtn", + [BTN_TOP2] = "TopBtn2", [BTN_PINKIE] = "PinkieBtn", + [BTN_BASE] = "BaseBtn", [BTN_BASE2] = "BaseBtn2", + [BTN_BASE3] = "BaseBtn3", [BTN_BASE4] = "BaseBtn4", + [BTN_BASE5] = "BaseBtn5", [BTN_BASE6] = "BaseBtn6", + [BTN_DEAD] = "BtnDead", [BTN_A] = "BtnA", + [BTN_B] = "BtnB", [BTN_C] = "BtnC", + [BTN_X] = "BtnX", [BTN_Y] = "BtnY", + [BTN_Z] = "BtnZ", [BTN_TL] = "BtnTL", + [BTN_TR] = "BtnTR", [BTN_TL2] = "BtnTL2", + [BTN_TR2] = "BtnTR2", [BTN_SELECT] = "BtnSelect", + [BTN_START] = "BtnStart", [BTN_MODE] = "BtnMode", + [BTN_THUMBL] = "BtnThumbL", [BTN_THUMBR] = "BtnThumbR", + [BTN_TOOL_PEN] = "ToolPen", [BTN_TOOL_RUBBER] = "ToolRubber", + [BTN_TOOL_BRUSH] = "ToolBrush", [BTN_TOOL_PENCIL] = "ToolPencil", + [BTN_TOOL_AIRBRUSH] = "ToolAirbrush", [BTN_TOOL_FINGER] = "ToolFinger", + [BTN_TOOL_MOUSE] = "ToolMouse", [BTN_TOOL_LENS] = "ToolLens", + [BTN_TOUCH] = "Touch", [BTN_STYLUS] = "Stylus", + [BTN_STYLUS2] = "Stylus2", [BTN_TOOL_DOUBLETAP] = "Tool Doubletap", + [BTN_TOOL_TRIPLETAP] = "Tool Tripletap", [BTN_GEAR_DOWN] = "WheelBtn", + [BTN_GEAR_UP] = "Gear up", [KEY_OK] = "Ok", + [KEY_SELECT] = "Select", [KEY_GOTO] = "Goto", + [KEY_CLEAR] = "Clear", [KEY_POWER2] = "Power2", + [KEY_OPTION] = "Option", [KEY_INFO] = "Info", + [KEY_TIME] = "Time", [KEY_VENDOR] = "Vendor", + [KEY_ARCHIVE] = "Archive", [KEY_PROGRAM] = "Program", + [KEY_CHANNEL] = "Channel", [KEY_FAVORITES] = "Favorites", + [KEY_EPG] = "EPG", [KEY_PVR] = "PVR", + [KEY_MHP] = "MHP", [KEY_LANGUAGE] = "Language", + [KEY_TITLE] = "Title", [KEY_SUBTITLE] = "Subtitle", + [KEY_ANGLE] = "Angle", [KEY_ZOOM] = "Zoom", + [KEY_MODE] = "Mode", [KEY_KEYBOARD] = "Keyboard", + [KEY_SCREEN] = "Screen", [KEY_PC] = "PC", + [KEY_TV] = "TV", [KEY_TV2] = "TV2", + [KEY_VCR] = "VCR", [KEY_VCR2] = "VCR2", + [KEY_SAT] = "Sat", [KEY_SAT2] = "Sat2", + [KEY_CD] = "CD", [KEY_TAPE] = "Tape", + [KEY_RADIO] = "Radio", [KEY_TUNER] = "Tuner", + [KEY_PLAYER] = "Player", [KEY_TEXT] = "Text", + [KEY_DVD] = "DVD", [KEY_AUX] = "Aux", + [KEY_MP3] = "MP3", [KEY_AUDIO] = "Audio", + [KEY_VIDEO] = "Video", [KEY_DIRECTORY] = "Directory", + [KEY_LIST] = "List", [KEY_MEMO] = "Memo", + [KEY_CALENDAR] = "Calendar", [KEY_RED] = "Red", + [KEY_GREEN] = "Green", [KEY_YELLOW] = "Yellow", + [KEY_BLUE] = "Blue", [KEY_CHANNELUP] = "ChannelUp", + [KEY_CHANNELDOWN] = "ChannelDown", [KEY_FIRST] = "First", + [KEY_LAST] = "Last", [KEY_AB] = "AB", + [KEY_NEXT] = "Next", [KEY_RESTART] = "Restart", + [KEY_SLOW] = "Slow", [KEY_SHUFFLE] = "Shuffle", + [KEY_BREAK] = "Break", [KEY_PREVIOUS] = "Previous", + [KEY_DIGITS] = "Digits", [KEY_TEEN] = "TEEN", + [KEY_TWEN] = "TWEN", [KEY_DEL_EOL] = "Delete EOL", + [KEY_DEL_EOS] = "Delete EOS", [KEY_INS_LINE] = "Insert line", + [KEY_DEL_LINE] = "Delete line", +}; char *absval[5] = { "Value", "Min ", "Max ", "Fuzz ", "Flat " }; -char *relatives[REL_MAX + 1] = { "X", "Y", "Z", NULL, NULL, NULL, "HWheel", "Dial", "Wheel" }; -char *absolutes[ABS_MAX + 1] = { "X", "Y", "Z", "Rx", "Ry", "Rz", "Throttle", "Rudder", "Wheel", "Gas", "Brake", -NULL, NULL, NULL, NULL, NULL, -"Hat0X", "Hat0Y", "Hat1X", "Hat1Y", "Hat2X", "Hat2Y", "Hat3X", "Hat 3Y", "Pressure", "Distance", "XTilt", "YTilt"}; -char *leds[LED_MAX + 1] = { "NumLock", "CapsLock", "ScrollLock", "Compose", "Kana", "Sleep", "Suspend", "Mute" }; -char *repeats[REP_MAX + 1] = { "Delay", "Period" }; -char *sounds[SND_MAX + 1] = { "Bell", "Click" }; -char **names[EV_MAX + 1] = { events, keys, relatives, absolutes, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, leds, sounds, NULL, repeats, NULL, NULL, NULL }; +char *relatives[REL_MAX + 1] = { + [0 ... REL_MAX] = NULL, + [REL_X] = "X", [REL_Y] = "Y", + [REL_Z] = "Z", [REL_HWHEEL] = "HWheel", + [REL_DIAL] = "Dial", [REL_WHEEL] = "Wheel", + [REL_MISC] = "Misc", +}; + +char *absolutes[ABS_MAX + 1] = { + [0 ... ABS_MAX] = NULL, + [ABS_X] = "X", [ABS_Y] = "Y", + [ABS_Z] = "Z", [ABS_RX] = "Rx", + [ABS_RY] = "Ry", [ABS_RZ] = "Rz", + [ABS_THROTTLE] = "Throttle", [ABS_RUDDER] = "Rudder", + [ABS_WHEEL] = "Wheel", [ABS_GAS] = "Gas", + [ABS_BRAKE] = "Brake", [ABS_HAT0X] = "Hat0X", + [ABS_HAT0Y] = "Hat0Y", [ABS_HAT1X] = "Hat1X", + [ABS_HAT1Y] = "Hat1Y", [ABS_HAT2X] = "Hat2X", + [ABS_HAT2Y] = "Hat2Y", [ABS_HAT3X] = "Hat3X", + [ABS_HAT3Y] = "Hat 3Y", [ABS_PRESSURE] = "Pressure", + [ABS_DISTANCE] = "Distance", [ABS_TILT_X] = "XTilt", + [ABS_TILT_Y] = "YTilt", [ABS_TOOL_WIDTH] = "Tool Width", + [ABS_VOLUME] = "Volume", [ABS_MISC] = "Misc", +}; + +char *misc[MSC_MAX + 1] = { + [ 0 ... MSC_MAX] = NULL, + [MSC_SERIAL] = "Serial", [MSC_PULSELED] = "Pulseled", + [MSC_GESTURE] = "Gesture" +}; + +char *leds[LED_MAX + 1] = { + [0 ... LED_MAX] = NULL, + [LED_NUML] = "NumLock", [LED_CAPSL] = "CapsLock", + [LED_SCROLLL] = "ScrollLock", [LED_COMPOSE] = "Compose", + [LED_KANA] = "Kana", [LED_SLEEP] = "Sleep", + [LED_SUSPEND] = "Suspend", [LED_MUTE] = "Mute", + [LED_MISC] = "Misc", +}; + +char *repeats[REP_MAX + 1] = { + [0 ... REP_MAX] = NULL, + [REP_DELAY] = "Delay", [REP_PERIOD] = "Period" +}; + +char *sounds[SND_MAX + 1] = { + [0 ... SND_MAX] = NULL, + [SND_CLICK] = "Click", [SND_BELL] = "Bell", + [SND_TONE] = "Tone" +}; + +char **names[EV_MAX + 1] = { + [0 ... EV_MAX] = NULL, + [EV_SYN] = events, [EV_KEY] = keys, + [EV_REL] = relatives, [EV_ABS] = absolutes, + [EV_MSC] = misc, [EV_LED] = leds, + [EV_SND] = sounds, [EV_REP] = repeats, +}; #define BITS_PER_LONG (sizeof(long) * 8) #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) @@ -108,17 +308,17 @@ if (argc < 2) { printf("Usage: evtest /dev/input/eventX\n"); printf("Where X = input device number\n"); - exit(1); + return 1; } if ((fd = open(argv[argc - 1], O_RDONLY)) < 0) { perror("evtest"); - exit(1); + return 1; } if (ioctl(fd, EVIOCGVERSION, &version)) { perror("evtest: can't get version"); - exit(1); + return 1; } printf("Input driver version is %d.%d.%d\n", @@ -138,6 +338,7 @@ for (i = 0; i < EV_MAX; i++) if (test_bit(i, bit[0])) { printf(" Event type %d (%s)\n", i, events[i] ? events[i] : "?"); + if (!i) continue; ioctl(fd, EVIOCGBIT(i, KEY_MAX), bit[i]); for (j = 0; j < KEY_MAX; j++) if (test_bit(j, bit[i])) { @@ -160,14 +361,14 @@ if (rd < (int) sizeof(struct input_event)) { printf("yyy\n"); perror("\nevtest: error reading"); - exit (1); + return 1; } for (i = 0; i < rd / sizeof(struct input_event); i++) if (ev[i].type == EV_SYN) { printf("Event: time %ld.%06ld, -------------- %s ------------\n", - ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].code ? "Report Sync" : "Config Sync"); + ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].code ? "Config Sync" : "Report Sync" ); } else { printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %d\n", ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].type, |
From: Aivils S. <ai...@us...> - 2003-12-23 08:08:17
|
Update of /cvsroot/linuxconsole/ruby In directory sc8-pr-cvs1:/tmp/cvs-serv17690 Added Files: AGAINST-2.6.0 Removed Files: AGAINST-2.6.0-test9 Log Message: sync to 2.6.0 --- NEW FILE: AGAINST-2.6.0 --- --- AGAINST-2.6.0-test9 DELETED --- |
From: Aivils S. <ai...@us...> - 2003-12-23 08:08:15
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6 In directory sc8-pr-cvs1:/tmp/cvs-serv17690/ruby-2.6 Modified Files: Makefile Log Message: sync to 2.6.0 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 28 Oct 2003 07:17:35 -0000 1.3 +++ Makefile 23 Dec 2003 08:08:01 -0000 1.4 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -test9-ruby +EXTRAVERSION = -ruby # *DOCUMENTATION* # To see a list of typical targets execute "make help" |
From: Aivils S. <ai...@us...> - 2003-12-23 07:44:05
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv14305/ruby-2.6/drivers/char Modified Files: consolemap.c vt.c vt_proc.c Log Message: list misunderstanding nasty bug Index: consolemap.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/consolemap.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- consolemap.c 28 Oct 2003 07:14:53 -0000 1.3 +++ consolemap.c 23 Dec 2003 07:44:02 -0000 1.4 @@ -667,9 +667,11 @@ void __init console_map_init(void) { - struct vt_struct *vt = (struct vt_struct *) vt_list.prev; + struct vt_struct *vt; int i; + vt = list_entry(vt_list.next, typeof(*vt), node); + for (i = 0; i < vt->vc_count; i++) { struct vc_data *vc = vt->vc_cons[i]; Index: vt.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/vt.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- vt.c 3 Dec 2003 07:27:18 -0000 1.12 +++ vt.c 23 Dec 2003 07:44:02 -0000 1.13 @@ -1813,7 +1813,7 @@ int __init vty_init(void) { - if (!vt_list.prev) + if (list_empty(&vt_list)) return -ENXIO; console_driver = alloc_tty_driver(MAX_NR_CONSOLES); Index: vt_proc.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/vt_proc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vt_proc.c 28 Oct 2003 07:14:53 -0000 1.2 +++ vt_proc.c 23 Dec 2003 07:44:02 -0000 1.3 @@ -177,13 +177,16 @@ int __init vt_proc_init(void) { struct vt_struct *vt; - if (vt_list.prev) { - proc_bus_console_dir = proc_mkdir(VT_PROC_DIR, proc_bus); - list_for_each_entry (vt, &vt_list, node) { - vt_proc_attach(vt); - } - } - return 0; + + if (list_empty(&vt_list)) + return 0; + + proc_bus_console_dir = proc_mkdir(VT_PROC_DIR, proc_bus); + list_for_each_entry (vt, &vt_list, node) { + vt_proc_attach(vt); + } + + return 0; } #endif /* CONFIG_PROC_FS */ |
From: Aivils S. <ai...@us...> - 2003-12-05 12:11:28
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/video In directory sc8-pr-cvs1:/tmp/cvs-serv2176/ruby-2.6/drivers/video Modified Files: fbmem.c Log Message: recognize modular fbcon though Index: fbmem.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/video/fbmem.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- fbmem.c 14 Oct 2003 08:32:10 -0000 1.1 +++ fbmem.c 5 Dec 2003 12:11:21 -0000 1.2 @@ -42,6 +42,7 @@ #include <asm/pgtable.h> #include <linux/fb.h> +#include <linux/vt_kern.h> #ifdef CONFIG_FRAMEBUFFER_CONSOLE #include "console/fbcon.h" @@ -960,6 +961,37 @@ return fb_set_cmap(&cmap, 1, info); } +int fbcon_in_use; +DECLARE_MUTEX(fbcon_sem); + +int +fb_resize_vt(struct fb_info *info) +{ + struct vt_struct *vt = info->display_fg; + struct vc_data *vc; + int i; + + down(&fbcon_sem); + if(!fbcon_in_use || !vt) + return -ENODEV; + + vc = vt->default_mode; + vc->vc_cols = info->var.xres/vc->vc_font.width; + vc->vc_rows = info->var.yres/vc->vc_font.height; + for(i = 0; i < vt->vc_count; i++) + vc_resize(vt->vc_cons[i], vc->vc_cols, vc->vc_rows); + up(&fbcon_sem); + return 0; +} + +void +fb_console_active(int active) +{ + down(&fbcon_sem); + fbcon_in_use = active; + up(&fbcon_sem); +} + static int fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) @@ -986,9 +1018,7 @@ return -EFAULT; i = fb_set_var(info, &var); if (i) return i; -#ifdef CONFIG_FRAMEBUFFER_CONSOLE - fbcon_resize_all(info); -#endif + fb_resize_vt(info); if (copy_to_user((void *) arg, &var, sizeof(var))) return -EFAULT; return 0; @@ -1390,5 +1420,6 @@ EXPORT_SYMBOL(fb_get_buffer_offset); EXPORT_SYMBOL(move_buf_unaligned); EXPORT_SYMBOL(move_buf_aligned); +EXPORT_SYMBOL(fb_console_active); MODULE_LICENSE("GPL"); |
From: Aivils S. <ai...@us...> - 2003-12-05 12:11:28
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/video/console In directory sc8-pr-cvs1:/tmp/cvs-serv2176/ruby-2.6/drivers/video/console Modified Files: fbcon.c Log Message: recognize modular fbcon though Index: fbcon.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/video/console/fbcon.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- fbcon.c 28 Oct 2003 07:14:53 -0000 1.3 +++ fbcon.c 5 Dec 2003 12:11:21 -0000 1.4 @@ -2272,23 +2272,6 @@ .con_resize = fbcon_resize, }; -int fbcon_resize_all(struct fb_info *info) -{ - struct vt_struct *vt = info->display_fg; - struct vc_data *vc; - int i; - - if(!vt) - return -ENODEV; - - vc = vt->default_mode; - vc->vc_cols = info->var.xres/vc->vc_font.width; - vc->vc_rows = info->var.yres/vc->vc_font.height; - for(i = 0; i < vt->vc_count; i++) - vc_resize(vt->vc_cons[i], vc->vc_cols, vc->vc_rows); - return 0; -} - int fbcon_add(int unit, int vc_count) { const char *display_desc = NULL; @@ -2349,12 +2332,14 @@ } else fbcon_add(unit, vt2fb[unit]); + fb_console_active(1); return 0; } void __exit fb_console_exit(void) { // give_up_console(&fb_con); + fb_console_active(0); } module_init(fb_console_init); |
From: Aivils S. <ai...@us...> - 2003-12-03 07:27:21
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv3479/ruby-2.6/drivers/char Modified Files: vt.c Log Message: old nasty bug of oversight Index: vt.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/vt.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- vt.c 14 Nov 2003 08:42:07 -0000 1.11 +++ vt.c 3 Dec 2003 07:27:18 -0000 1.12 @@ -1083,9 +1083,9 @@ video_size_row = new_row_size; screenbuf_size = ss; - err = resize_screen(vc, new_cols * vc->vc_font.width, new_rows * vc->vc_font.height); + err = resize_screen(vc, new_cols, new_rows); if (err) { - resize_screen(vc, old_cols * vc->vc_font.width, old_rows * vc->vc_font.height); + resize_screen(vc, old_cols, old_rows); kfree(newscreen); return err; } |
From: James S. <jsi...@us...> - 2003-11-14 17:44:27
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/fs In directory sc8-pr-cvs1:/tmp/cvs-serv4668/fs Modified Files: compat_ioctl.c Log Message: Syned to BK tree. Shrink the diff size. Index: compat_ioctl.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/fs/compat_ioctl.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- compat_ioctl.c 28 Oct 2003 07:17:36 -0000 1.3 +++ compat_ioctl.c 14 Nov 2003 17:44:22 -0000 1.4 @@ -1587,8 +1587,8 @@ static int do_fontx_ioctl(unsigned int fd, int cmd, struct consolefontdesc32 *user_cfd, struct file *file) { - struct tty_struct *tty = (struct tty_struct *) file->private_data; - struct vc_data *vc = (struct vc_data *) tty->driver_data; + struct tty_struct *tty = (struct tty_struct *) file->private_data; + struct vc_data *vc = (struct vc_data *) tty->driver_data; struct consolefontdesc cfdarg; struct console_font_op op; int i, perm; @@ -1644,10 +1644,10 @@ static int do_kdfontop_ioctl(unsigned int fd, unsigned int cmd, struct console_font_op32 *fontop, struct file *file) { - struct tty_struct *tty = (struct tty_struct *) file->private_data; - struct vc_data *vc = (struct vc_data *) tty->driver_data; - struct console_font_op op; + struct tty_struct *tty = (struct tty_struct *) file->private_data; + struct vc_data *vc = (struct vc_data *) tty->driver_data; int perm = vt_check(file), i; + struct console_font_op op; struct vt_struct *vt; if (perm < 0) return perm; @@ -1673,10 +1673,10 @@ static int do_unimap_ioctl(unsigned int fd, unsigned int cmd, struct unimapdesc32 *user_ud, struct file *file) { - struct tty_struct *tty = (struct tty_struct *) file->private_data; - struct vc_data *vc = (struct vc_data *) tty->driver_data; - struct unimapdesc32 tmp; + struct tty_struct *tty = (struct tty_struct *) file->private_data; + struct vc_data *vc = (struct vc_data *) tty->driver_data; int perm = vt_check(file); + struct unimapdesc32 tmp; if (perm < 0) return perm; if (copy_from_user(&tmp, user_ud, sizeof tmp)) |
From: James S. <jsi...@us...> - 2003-11-14 17:44:27
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv4668/drivers/char Modified Files: Kconfig Makefile sysrq.c tty_io.c Log Message: Syned to BK tree. Shrink the diff size. Index: Kconfig =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/Kconfig,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Kconfig 28 Oct 2003 07:17:36 -0000 1.3 +++ Kconfig 14 Nov 2003 17:44:22 -0000 1.4 @@ -36,11 +36,11 @@ shiny Linux system :-) config VT_BDSM - bool "ISO6429 bidirectional support" - depends on VT - ---help--- - If you say yes you will get support for the ability to type left to - right or right to left. + bool "ISO6429 bidirectional support" + depends on VT + ---help--- + If you say yes you will get support for the ability to type left to + right or right to left. config VT_CONSOLE bool "Support for console on virtual terminal" if EMBEDDED Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 28 Oct 2003 07:17:36 -0000 1.4 +++ Makefile 14 Nov 2003 17:44:22 -0000 1.5 @@ -42,7 +42,7 @@ obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o obj-$(CONFIG_RAW_DRIVER) += raw.o -obj-$(CONFIG_SGI_L1_SERIAL) += sn_serial.o +obj-$(CONFIG_SGI_L1_SERIAL) += sn_serial.o obj-$(CONFIG_PRINTER) += lp.o obj-$(CONFIG_TIPAR) += tipar.o Index: sysrq.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/sysrq.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- sysrq.c 2 Oct 2003 09:32:18 -0000 1.2 +++ sysrq.c 14 Nov 2003 17:44:22 -0000 1.3 @@ -36,6 +36,7 @@ #include <asm/ptrace.h> + /* Whether we react on sysrq keys or just ignore them */ int sysrq_enabled = 1; Index: tty_io.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/tty_io.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- tty_io.c 28 Oct 2003 07:17:36 -0000 1.5 +++ tty_io.c 14 Nov 2003 17:44:22 -0000 1.6 @@ -1490,6 +1490,7 @@ #ifdef CONFIG_VT if (tty->driver->type == TTY_DRIVER_TYPE_CONSOLE) { struct vc_data *vc = (struct vc_data *) tty->driver_data; + if (!vc || vc_resize(vc, tmp_ws.ws_col, tmp_ws.ws_row)) return -ENXIO; } @@ -2372,6 +2373,7 @@ } EXPORT_SYMBOL(tty_unregister_driver); + /* * Initialize the console device. This is called *early*, so |
From: James S. <jsi...@us...> - 2003-11-14 17:44:26
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/arch/i386/kernel In directory sc8-pr-cvs1:/tmp/cvs-serv4668/arch/i386/kernel Modified Files: setup.c Log Message: Syned to BK tree. Shrink the diff size. Index: setup.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/arch/i386/kernel/setup.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- setup.c 28 Oct 2003 07:17:35 -0000 1.3 +++ setup.c 14 Nov 2003 17:44:22 -0000 1.4 @@ -32,7 +32,6 @@ #include <linux/initrd.h> #include <linux/bootmem.h> #include <linux/seq_file.h> -#include <linux/console.h> #include <linux/root_dev.h> #include <linux/highmem.h> #include <linux/module.h> @@ -1025,6 +1024,7 @@ #endif register_memory(max_low_pfn); + } #include "setup_arch_post.h" |
From: James S. <jsi...@us...> - 2003-11-14 17:44:26
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux In directory sc8-pr-cvs1:/tmp/cvs-serv4668/include/linux Modified Files: console.h tty.h Log Message: Syned to BK tree. Shrink the diff size. Index: console.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/console.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- console.h 11 Aug 2003 16:26:46 -0000 1.1 +++ console.h 14 Nov 2003 17:44:23 -0000 1.2 @@ -15,7 +15,6 @@ #define _LINUX_CONSOLE_H_ 1 #include <linux/types.h> -#include <linux/kdev_t.h> #include <linux/spinlock.h> /* Index: tty.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/tty.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- tty.h 2 Oct 2003 09:32:19 -0000 1.2 +++ tty.h 14 Nov 2003 17:44:23 -0000 1.3 @@ -332,6 +332,7 @@ extern struct termios tty_std_termios; extern struct tty_ldisc ldiscs[]; + extern void console_init(void); extern int vcs_init(void); extern int vty_init(void); |