diff options
Diffstat (limited to 'klaptopdaemon/linux/ds.h')
| -rw-r--r-- | klaptopdaemon/linux/ds.h | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/klaptopdaemon/linux/ds.h b/klaptopdaemon/linux/ds.h index 11e0740..515a0ed 100644 --- a/klaptopdaemon/linux/ds.h +++ b/klaptopdaemon/linux/ds.h @@ -1,8 +1,8 @@ /* - * ds.h 1.49 1998/08/03 19:12:23 + * ds.h 1.55 1999/10/25 20:23:17 * * The contents of this file are subject to the Mozilla Public License - * Version 1.0 (the "License"); you may not use this file except in + * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License * at http://www.mozilla.org/MPL/ * @@ -12,8 +12,19 @@ * limitations under the License. * * The initial developer of the original code is David A. Hinds - * <dhinds@hyper.stanford.edu>. Portions created by David A. Hinds - * are Copyright (C) 1998 David A. Hinds. All Rights Reserved. + * <dhinds@pcmcia.sourceforge.org>. Portions created by David A. Hinds + * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. + * + * Alternatively, the contents of this file may be used under the + * terms of the GNU Public License version 2 (the "GPL"), in which + * case the provisions of the GPL are applicable instead of the + * above. If you wish to allow the use of your version of this file + * only under the terms of the GPL and not to allow others to use + * your version of this file under the MPL, indicate your decision by + * deleting the provisions above and replace them with the notice and + * other provisions required by the GPL. If you do not delete the + * provisions above, a recipient may use your version of this file + * under either the MPL or the GPL. */ #ifndef _LINUX_DS_H @@ -28,6 +39,12 @@ typedef struct tuple_parse_t { cisparse_t parse; } tuple_parse_t; +typedef struct win_info_t { + window_handle_t handle; + win_req_t window; + memreq_t map; +} win_info_t; + typedef struct bind_info_t { dev_info_t dev_info; u_char function; @@ -56,6 +73,7 @@ typedef union ds_ioctl_arg_t { region_info_t region; bind_info_t bind_info; mtd_info_t mtd_info; + win_info_t win_info; cisdump_t cisdump; } ds_ioctl_arg_t; @@ -77,6 +95,9 @@ typedef union ds_ioctl_arg_t { #define DS_GET_FIRST_REGION _IOWR('d', 16, region_info_t) #define DS_GET_NEXT_REGION _IOWR('d', 17, region_info_t) #define DS_REPLACE_CIS _IOWR('d', 18, cisdump_t) +#define DS_GET_FIRST_WINDOW _IOR ('d', 19, win_info_t) +#define DS_GET_NEXT_WINDOW _IOWR('d', 20, win_info_t) +#define DS_GET_MEM_PAGE _IOWR('d', 21, win_info_t) #define DS_BIND_REQUEST _IOWR('d', 60, bind_info_t) #define DS_GET_DEVICE_INFO _IOWR('d', 61, bind_info_t) @@ -89,7 +110,7 @@ typedef union ds_ioctl_arg_t { typedef struct dev_link_t { dev_node_t *dev; u_int state, open; - struct wait_queue *pending; + wait_queue_head_t pending; struct timer_list release; client_handle_t handle; io_req_t io; |