diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-07-31 23:06:33 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-07-31 23:06:33 +0000 |
| commit | e4ac0a23608326673055e4f864a554ee34559250 (patch) | |
| tree | d99d4ec5fa3f3444b8715adebcf4880120dc1a0f /include | |
| parent | 9765588f1533bde5f6af8056525368b301d72989 (diff) | |
shared memory input queue changes:
- make keyboard forward events to the streams keyboard
module for delivery to the shmiq.
- Fixes to make the graphics streams driver use dentries
(this is the reason Alex's compile failed).
- Major/misc numbers that were assigned by HPA for the
streamable devices.
- keyboard streams device.
- working shmiq framework for the keyboard.
What needs to be done:
- Fix the mouse driver, did someone ever got any
information out from /dev/psaux on the SGI port?
- Figure out why changes made in the kernel side to the
SHMIQ are not always seen by the user space.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/gfx.h | 2 | ||||
| -rw-r--r-- | include/linux/major.h | 1 | ||||
| -rw-r--r-- | include/linux/miscdevice.h | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/include/asm-mips/gfx.h b/include/asm-mips/gfx.h index b5d8c7ac9..cf4c9d8ad 100644 --- a/include/asm-mips/gfx.h +++ b/include/asm-mips/gfx.h @@ -41,4 +41,6 @@ struct gfx_attach_board_args { #ifdef __KERNEL__ /* umap.c */ extern void remove_mapping (struct task_struct *, unsigned long, unsigned long); +extern void *vmalloc_uncached (unsigned long size); +extern int vmap_page_range (unsigned long from, unsigned long size, unsigned long vaddr); #endif diff --git a/include/linux/major.h b/include/linux/major.h index 6e785af86..d72e6c2be 100644 --- a/include/linux/major.h +++ b/include/linux/major.h @@ -58,6 +58,7 @@ #define ACSI_MAJOR 28 #define AZTECH_CDROM_MAJOR 29 #define GRAPHDEV_MAJOR 29 /* SparcLinux & Linux/68k /dev/fb */ +#define SHMIQ_MAJOR 85 /* Linux/mips, SGI /dev/shmiq */ #define CM206_CDROM_MAJOR 32 #define IDE2_MAJOR 33 #define IDE3_MAJOR 34 diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 8f4bde9ab..6ea9d896e 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h @@ -13,9 +13,11 @@ #define SUN_OPENPROM_MINOR 139 #define MISC_DYNAMIC_MINOR 255 -#define SGI_GRAPHICS_MINOR 20 -#define SGI_OPENGL_MINOR 21 -#define SGI_GFX_MINOR 22 +#define SGI_GRAPHICS_MINOR 146 +#define SGI_OPENGL_MINOR 147 +#define SGI_GFX_MINOR 148 +#define SGI_STREAMS_MOUSE 149 +#define SGI_STREAMS_KEYBOARD 150 extern int misc_init(void); |