Menu
▾
▴
[Linuxconsole-commit]CVS: ruby/ruby-2.6/include/linux fb.h,1.3,1.4 input.h,1.5,1.6 selection.h,1.2,1.3 tty.h,1.5,1.6 vt_kern.h,1.10,1.11
|
From: Aivils S. <ai...@us...> - 2004-06-17 10:45:04
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30292/ruby-2.6/include/linux Modified Files: fb.h input.h selection.h tty.h vt_kern.h Log Message: sync to 2.6.7 Index: fb.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/fb.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- fb.h 23 Apr 2004 07:36:56 -0000 1.3 +++ fb.h 17 Jun 2004 10:44:53 -0000 1.4 @@ -512,6 +512,7 @@ struct fb_fix_screeninfo fix; /* Current fix */ struct fb_monspecs monspecs; /* Current Monitor specs */ struct fb_cursor cursor; /* Current cursor */ + struct timer_list cursor_timer; struct work_struct queue; /* Framebuffer event queue */ struct fb_pixmap pixmap; /* Image hardware mapper */ struct fb_pixmap sprite; /* Cursor hardware mapper */ Index: input.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/input.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- input.h 20 Feb 2004 06:52:19 -0000 1.5 +++ input.h 17 Jun 2004 10:44:53 -0000 1.6 @@ -655,7 +655,7 @@ struct ff_envelope envelope; /* Only used if waveform == FF_CUSTOM */ - __u32 custom_len; /* Number of samples */ + __u32 custom_len; /* Number of samples */ __s16 *custom_data; /* Buffer of samples */ /* Note: the data pointed by custom_data is copied by the driver. You can * therefore dispose of the memory after the upload/update */ @@ -749,8 +749,6 @@ #define INPUT_KEYCODE(dev, scancode) ((dev->keycodesize == 1) ? ((u8*)dev->keycode)[scancode] : \ ((dev->keycodesize == 2) ? ((u16*)dev->keycode)[scancode] : (((u32*)dev->keycode)[scancode]))) -#define init_input_dev(dev) do { INIT_LIST_HEAD(&((dev)->h_list)); INIT_LIST_HEAD(&((dev)->node)); } while (0) - #define SET_INPUT_KEYCODE(dev, scancode, val) \ ({ unsigned __old; \ switch (dev->keycodesize) { \ @@ -915,6 +913,12 @@ #define to_handle(n) container_of(n,struct input_handle,d_node) #define to_handle_h(n) container_of(n,struct input_handle,h_node) +static inline void init_input_dev(struct input_dev *dev) +{ + INIT_LIST_HEAD(&dev->h_list); + INIT_LIST_HEAD(&dev->node); +} + void input_register_device(struct input_dev *); void input_unregister_device(struct input_dev *); @@ -933,14 +937,51 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value); struct input_handle *input_find_handle(char *phys_descr); -#define input_report_key(a,b,c) input_event(a, EV_KEY, b, !!(c)) -#define input_report_rel(a,b,c) input_event(a, EV_REL, b, c) -#define input_report_abs(a,b,c) input_event(a, EV_ABS, b, c) -#define input_report_ff(a,b,c) input_event(a, EV_FF, b, c) -#define input_report_ff_status(a,b,c) input_event(a, EV_FF_STATUS, b, c) +static inline void input_report_key(struct input_dev *dev, unsigned int code, int value) +{ + input_event(dev, EV_KEY, code, !!value); +} -#define input_regs(a,b) do { (a)->regs = (b); } while (0) -#define input_sync(a) do { input_event(a, EV_SYN, SYN_REPORT, 0); (a)->regs = NULL; } while (0) +static inline void input_report_rel(struct input_dev *dev, unsigned int code, int value) +{ + input_event(dev, EV_REL, code, value); +} + +static inline void input_report_abs(struct input_dev *dev, unsigned int code, int value) +{ + input_event(dev, EV_ABS, code, value); +} + +static inline void input_report_ff(struct input_dev *dev, unsigned int code, int value) +{ + input_event(dev, EV_FF, code, value); +} + +static inline void input_report_ff_status(struct input_dev *dev, unsigned int code, int value) +{ + input_event(dev, EV_FF_STATUS, code, value); +} + +static inline void input_regs(struct input_dev *dev, struct pt_regs *regs) +{ + dev->regs = regs; +} + +static inline void input_sync(struct input_dev *dev) +{ + input_event(dev, EV_SYN, SYN_REPORT, 0); + dev->regs = NULL; +} + +static inline void input_set_abs_params(struct input_dev *dev, int axis, int min, int max, int fuzz, int flat) +{ + dev->absmin[axis] = min; + dev->absmax[axis] = max; + dev->absfuzz[axis] = fuzz; + dev->absflat[axis] = flat; + + dev->absbit[LONG(axis)] |= BIT(axis); +} extern struct class_simple *input_class; Index: selection.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/selection.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- selection.h 20 Feb 2004 06:52:19 -0000 1.2 +++ selection.h 17 Jun 2004 10:44:53 -0000 1.3 @@ -13,9 +13,9 @@ extern int sel_cons; extern void clear_selection(void); -extern int set_selection(const struct tiocl_selection *sel, struct tty_struct *tty, int user); +extern int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *tty); extern int paste_selection(struct tty_struct *tty); -extern int sel_loadlut(const unsigned long arg); +extern int sel_loadlut(char __user *p); extern int mouse_reporting(struct vc_data *vc); extern void mouse_report(struct vc_data *vc, int butt, int mrx, int mry); Index: tty.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/tty.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- tty.h 25 May 2004 05:26:49 -0000 1.5 +++ tty.h 17 Jun 2004 10:44:53 -0000 1.6 @@ -87,7 +87,6 @@ #define VIDEO_TYPE_PICA_S3 0x30 /* ACER PICA-61 local S3 video */ #define VIDEO_TYPE_MIPS_G364 0x31 /* MIPS Magnum 4000 G364 video */ -#define VIDEO_TYPE_SNI_RM 0x32 /* SNI RM200 PCI video */ #define VIDEO_TYPE_SGI 0x33 /* Various SGI graphics hardware */ #define VIDEO_TYPE_TGAC 0x40 /* DEC TGA */ Index: vt_kern.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/vt_kern.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- vt_kern.h 23 Apr 2004 07:36:56 -0000 1.10 +++ vt_kern.h 17 Jun 2004 10:44:53 -0000 1.11 @@ -185,7 +185,10 @@ unsigned char vc_saved_GS; }; +struct module; + struct consw { + struct module *owner; const char *(*con_startup)(struct vt_struct *, int); void (*con_init)(struct vc_data *, int); void (*con_deinit)(struct vc_data *); @@ -312,7 +315,7 @@ void unblank_screen(void); void poke_blanked_console(struct vt_struct *vt); int con_font_op(struct vc_data *vc, struct console_font_op *op); -void take_over_console(struct vt_struct *vt, const struct consw *sw); +int take_over_console(struct vt_struct *vt, const struct consw *sw); int tioclinux(struct tty_struct *tty, unsigned long arg); @@ -320,14 +323,14 @@ struct unimapinit; struct unipair; -int con_set_trans_old(struct vc_data *vc, unsigned char *table); -int con_get_trans_old(struct vc_data *vc, unsigned char *table); -int con_set_trans_new(struct vc_data *vc, unsigned short *table); -int con_get_trans_new(struct vc_data *vc, unsigned short *table); +int con_set_trans_old(struct vc_data *vc, unsigned char __user *table); +int con_get_trans_old(struct vc_data *vc, unsigned char __user *table); +int con_set_trans_new(struct vc_data *vc, unsigned short __user *table); +int con_get_trans_new(struct vc_data *vc, unsigned short __user *table); int con_clear_unimap(struct vc_data *vc, struct unimapinit *ui); -int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair *list); -int con_get_unimap(struct vc_data *vc, ushort ct, ushort * uct, - struct unipair *list); +int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list); +int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user * uct, + struct unipair __user *list); int con_set_default_unimap(struct vc_data *vc); void con_free_unimap(struct vc_data *vc); void con_protect_unimap(struct vc_data *vc, int rdonly); |
