vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove grub_video_iterate

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-27 00:36:28 +01:00
parent c96db58ec5
commit 9eade9dbd7
2 changed files with 24 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/grub/video.h
View file

@ -21,6 +21,7 @@
#include <grub/err.h> #include <grub/err.h>
#include <grub/types.h> #include <grub/types.h>
#include <grub/list.h>
/* Video color in hardware dependent format. Users should not assume any /* Video color in hardware dependent format. Users should not assume any
specific coding format. */ specific coding format. */
@ -185,6 +186,9 @@ typedef enum grub_video_driver_id
struct grub_video_adapter struct grub_video_adapter
{ {
/* The next video adapter. */
struct grub_video_adapter *next;
/* The video adapter name. */ /* The video adapter name. */
const char *name; const char *name;
grub_video_driver_id_t id; grub_video_driver_id_t id;
@ -253,15 +257,28 @@ struct grub_video_adapter
grub_err_t (*set_active_render_target) (struct grub_video_render_target *target); grub_err_t (*set_active_render_target) (struct grub_video_render_target *target);
grub_err_t (*get_active_render_target) (struct grub_video_render_target **target); grub_err_t (*get_active_render_target) (struct grub_video_render_target **target);
/* The next video adapter. */
struct grub_video_adapter *next;
}; };
typedef struct grub_video_adapter *grub_video_adapter_t; typedef struct grub_video_adapter *grub_video_adapter_t;
void EXPORT_FUNC (grub_video_register) (grub_video_adapter_t adapter); extern grub_video_adapter_t EXPORT_VAR(grub_video_adapter_list);
void grub_video_unregister (grub_video_adapter_t adapter);
void grub_video_iterate (int (*hook) (grub_video_adapter_t adapter)); /* Register video driver. */
static inline void
grub_video_register (grub_video_adapter_t adapter)
{
grub_list_push (GRUB_AS_LIST_P (&grub_video_adapter_list),
GRUB_AS_LIST (adapter));
}
/* Unregister video driver. */
static inline void
grub_video_unregister (grub_video_adapter_t adapter)
{
grub_list_remove (GRUB_AS_LIST_P (&grub_video_adapter_list),
GRUB_AS_LIST (adapter));
}
#define FOR_VIDEO_ADAPTERS(var) FOR_LIST_ELEMENTS((var), (grub_video_adapter_list))
grub_err_t EXPORT_FUNC (grub_video_restore) (void); grub_err_t EXPORT_FUNC (grub_video_restore) (void);

35
video/video.c
View file

@ -23,44 +23,11 @@
#include <grub/mm.h> #include <grub/mm.h>
/* The list of video adapters registered to system. */ /* The list of video adapters registered to system. */
static grub_video_adapter_t grub_video_adapter_list; grub_video_adapter_t grub_video_adapter_list = NULL;
/* Active video adapter. */ /* Active video adapter. */
static grub_video_adapter_t grub_video_adapter_active; static grub_video_adapter_t grub_video_adapter_active;
/* Register video driver. */
void
grub_video_register (grub_video_adapter_t adapter)
{
adapter->next = grub_video_adapter_list;
grub_video_adapter_list = adapter;
}
/* Unregister video driver. */
void
grub_video_unregister (grub_video_adapter_t adapter)
{
grub_video_adapter_t *p, q;
for (p = &grub_video_adapter_list, q = *p; q; p = &(q->next), q = q->next)
if (q == adapter)
{
*p = q->next;
break;
}
}
/* Iterate thru all registered video drivers. */
void
grub_video_iterate (int (*hook) (grub_video_adapter_t adapter))
{
grub_video_adapter_t p;
for (p = grub_video_adapter_list; p; p = p->next)
if (hook (p))
break;
}
/* Restore back to initial mode (where applicable). */ /* Restore back to initial mode (where applicable). */
grub_err_t grub_err_t
grub_video_restore (void) grub_video_restore (void)