diff options
| author | phk <phk@FreeBSD.org> | 2003-03-03 16:34:54 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-03-03 16:34:54 +0000 |
| commit | 846509503716e0461e5635fc51ce7703d1f5b2d1 (patch) | |
| tree | 1e796a976d68862d335382e326ab5f5a871eaa47 | |
| parent | b67232b68cdcbb54dc3a2311609828aced7ecc25 (diff) | |
| download | FreeBSD-src-846509503716e0461e5635fc51ce7703d1f5b2d1.zip FreeBSD-src-846509503716e0461e5635fc51ce7703d1f5b2d1.tar.gz | |
Rearrange the members of struct cdevsw to be absolutely sure to catch
any initializations which are not done right.
| -rw-r--r-- | sys/sys/conf.h | 8 | ||||
| -rw-r--r-- | sys/sys/linedisc.h | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 1bb71b3..3175b69 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -219,6 +219,9 @@ typedef int dumper_t( * Character device switch table */ struct cdevsw { + int d_maj; + u_int d_flags; + const char *d_name; d_open_t *d_open; d_close_t *d_close; d_read_t *d_read; @@ -227,12 +230,7 @@ struct cdevsw { d_poll_t *d_poll; d_mmap_t *d_mmap; d_strategy_t *d_strategy; - const char *d_name; /* base device name, e.g. 'vn' */ - int d_maj; dumper_t *d_dump; - void *__d_unused_was_psize; - u_int d_flags; - /* additions below are not binary compatible with 4.2 and below */ d_kqfilter_t *d_kqfilter; }; diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h index 1bb71b3..3175b69 100644 --- a/sys/sys/linedisc.h +++ b/sys/sys/linedisc.h @@ -219,6 +219,9 @@ typedef int dumper_t( * Character device switch table */ struct cdevsw { + int d_maj; + u_int d_flags; + const char *d_name; d_open_t *d_open; d_close_t *d_close; d_read_t *d_read; @@ -227,12 +230,7 @@ struct cdevsw { d_poll_t *d_poll; d_mmap_t *d_mmap; d_strategy_t *d_strategy; - const char *d_name; /* base device name, e.g. 'vn' */ - int d_maj; dumper_t *d_dump; - void *__d_unused_was_psize; - u_int d_flags; - /* additions below are not binary compatible with 4.2 and below */ d_kqfilter_t *d_kqfilter; }; |
