diff options
| author | Christopher Ferris <cferris@google.com> | 2014-07-09 15:33:25 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-07-10 13:32:32 -0700 |
| commit | 38062f954c637861348dd8078cefb73554e6f12c (patch) | |
| tree | 5fef4bcbf86fc780ac83ee0e2ab2f0f6cdfc9408 /libc/kernel/uapi/linux/virtio_console.h | |
| parent | 4c199170a84e725a56b7d40c113c9d76a75d89ab (diff) | |
| download | bionic-38062f954c637861348dd8078cefb73554e6f12c.zip bionic-38062f954c637861348dd8078cefb73554e6f12c.tar.gz bionic-38062f954c637861348dd8078cefb73554e6f12c.tar.bz2 | |
Update kernel headers to v3.14.
Other changes:
- Modify update_all.py to skip ion header files when importing into aosp.
- Fix generate_uapi_headers.sh to handle imports from a linux-stable kernel.
Change-Id: I1ad81b9ccb063c21740f9875f2cc1238052cd4b3
Diffstat (limited to 'libc/kernel/uapi/linux/virtio_console.h')
| -rw-r--r-- | libc/kernel/uapi/linux/virtio_console.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libc/kernel/uapi/linux/virtio_console.h b/libc/kernel/uapi/linux/virtio_console.h index 148ffe0..81d515c 100644 --- a/libc/kernel/uapi/linux/virtio_console.h +++ b/libc/kernel/uapi/linux/virtio_console.h @@ -24,28 +24,31 @@ #include <linux/virtio_config.h> #define VIRTIO_CONSOLE_F_SIZE 0 #define VIRTIO_CONSOLE_F_MULTIPORT 1 -#define VIRTIO_CONSOLE_BAD_ID (~(__u32)0) +#define VIRTIO_CONSOLE_F_EMERG_WRITE 2 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define VIRTIO_CONSOLE_BAD_ID (~(__u32)0) struct virtio_console_config { __u16 cols; __u16 rows; - __u32 max_nr_ports; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u32 max_nr_ports; + __u32 emerg_wr; } __attribute__((packed)); struct virtio_console_control { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 id; __u16 event; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u16 value; }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define VIRTIO_CONSOLE_DEVICE_READY 0 #define VIRTIO_CONSOLE_PORT_ADD 1 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define VIRTIO_CONSOLE_PORT_REMOVE 2 #define VIRTIO_CONSOLE_PORT_READY 3 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define VIRTIO_CONSOLE_CONSOLE_PORT 4 #define VIRTIO_CONSOLE_RESIZE 5 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define VIRTIO_CONSOLE_PORT_OPEN 6 #define VIRTIO_CONSOLE_PORT_NAME 7 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif |