← Back to branch summary

~ubuntu-branches/ubuntu/wily/grub2/wily-proposed

« back to all changes in this revision

Viewing changes to include/grub/video.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Zielcke, Robert Millan, Felix Zielcke
  • Date: 2010-01-26 19:26:25 UTC
  • mfrom: (1.13.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100126192625-coq6czap2ofjollf
Tags: 1.98~20100126-1
* New Bazaar snapshot.
  - Includes mipsel-yeeloong port.

[ Robert Millan ]
* config.in: Lower priority of grub2/linux_cmdline_default.

[ Felix Zielcke ]
* Drop `CFLAGS=-O0' workaround on powerpc. Should be fixed correctly now.
* Ship grub-bin2h and grub-script-check in grub-common.
* Terminate NEWS.Debian with a blank line like lintian would suggest
  if that check would be working correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/grub/video.h
180
180
  grub_err_t (*fini) (void);
181
181
 
182
182
  grub_err_t (*setup) (unsigned int width,  unsigned int height,
183
 
                       unsigned int mode_type);
 
183
                       unsigned int mode_type, unsigned int mode_mask);
184
184
 
185
185
  grub_err_t (*get_info) (struct grub_video_mode_info *mode_info);
186
186
 
316
316
grub_err_t grub_video_get_active_render_target (struct grub_video_render_target **target);
317
317
 
318
318
grub_err_t grub_video_set_mode (const char *modestring,
319
 
                                int NESTED_FUNC_ATTR (*hook) (grub_video_adapter_t p,
320
 
                                                              struct grub_video_mode_info *mode_info));
 
319
                                unsigned int modemask,
 
320
                                unsigned int modevalue);
 
321
 
 
322
static inline int
 
323
grub_video_check_mode_flag (unsigned int flags, unsigned int mask,
 
324
                            unsigned int flag, int def)
 
325
{
 
326
  return (flag & mask) ? !! (flags & flag) : def;
 
327
}
321
328
 
322
329
grub_video_driver_id_t
323
330
grub_video_get_driver_id (void);