diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2001-06-13 10:58:39 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2001-06-13 10:58:39 +0000 |
| commit | f41325db5f16640212574a03b9a34e5ed4a884ca (patch) | |
| tree | 88aef8097c80f09c2f725d61b6da4d433a595a61 /sys/dev/fb | |
| parent | f3a6406c668744d1692c960352110b9b4c7ea9a6 (diff) | |
Notes
Diffstat (limited to 'sys/dev/fb')
| -rw-r--r-- | sys/dev/fb/fb.c | 15 | ||||
| -rw-r--r-- | sys/dev/fb/fbreg.h | 1 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 3d927617369c..056988dc02b5 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -39,12 +39,15 @@ #include <sys/module.h> #include <sys/uio.h> #include <sys/fbio.h> +#include <sys/linker_set.h> #include <vm/vm.h> #include <vm/pmap.h> #include <dev/fb/fbreg.h> +SET_DECLARE(videodriver_set, const video_driver_t); + /* local arrays */ /* @@ -160,8 +163,8 @@ vid_register(video_adapter_t *adp) adp->va_index = index; adp->va_token = NULL; - list = (const video_driver_t **)videodriver_set.ls_items; - while ((p = *list++) != NULL) { + SET_FOREACH(list, videodriver_set) { + p = *list; if (strcmp(p->name, adp->va_name) == 0) { adapter[index] = adp; vidsw[index] = p->vidsw; @@ -192,8 +195,8 @@ video_switch_t const video_driver_t **list; const video_driver_t *p; - list = (const video_driver_t **)videodriver_set.ls_items; - while ((p = *list++) != NULL) { + SET_FOREACH(list, videodriver_set) { + p = *list; if (strcmp(p->name, name) == 0) return p->vidsw; } @@ -281,8 +284,8 @@ vid_configure(int flags) const video_driver_t **list; const video_driver_t *p; - list = (const video_driver_t **)videodriver_set.ls_items; - while ((p = *list++) != NULL) { + SET_FOREACH(list, videodriver_set) { + p = *list; if (p->configure != NULL) (*p->configure)(flags); } diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h index 7070f19d52f4..ba6c0e1322c3 100644 --- a/sys/dev/fb/fbreg.h +++ b/sys/dev/fb/fbreg.h @@ -148,7 +148,6 @@ typedef struct video_driver { /* global variables */ extern struct video_switch **vidsw; -extern struct linker_set videodriver_set; /* functions for the video card driver */ int vid_register(video_adapter_t *adp); |