← Back to branch summary

~ilya-yanok/ubuntu/precise/grub2/fix-for-948716

« back to all changes in this revision

Viewing changes to video/video.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Millan
  • Date: 2009-07-25 19:00:53 UTC
  • mfrom: (1.6.3 upstream)
  • mto: (17.4.13 sid)
  • mto: This revision was merged to the branch mainline in revision 53.
  • Revision ID: james.westby@ubuntu.com-20090725190053-uv3lm6ya3zxs77ep
Import upstream version 1.96+20090725

Show diffs side-by-side

added added

removed removed

Lines of Context:
video/video.c
93
93
  return grub_video_adapter_active->get_info (mode_info);
94
94
}
95
95
 
96
 
/* Get information about active video mode.  */
97
 
grub_err_t
98
 
grub_video_get_info_and_fini (struct grub_video_mode_info *mode_info,
99
 
                              void **framebuffer)
100
 
{
101
 
  grub_err_t err;
102
 
 
103
 
  if (! grub_video_adapter_active)
104
 
    return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
105
 
 
106
 
  err = grub_video_adapter_active->get_info_and_fini (mode_info, framebuffer);
107
 
  if (err)
108
 
    return err;
109
 
 
110
 
  grub_video_adapter_active = 0;
111
 
  return GRUB_ERR_NONE;
112
 
}
113
 
 
114
96
/* Determine optimized blitting formation for specified video mode info.  */
115
97
enum grub_video_blit_format
116
98
grub_video_get_blit_format (struct grub_video_mode_info *mode_info)
181
163
          return GRUB_VIDEO_BLIT_FORMAT_RGB_565;
182
164
        }
183
165
    }
184
 
  else if (mode_info->bpp == 1)
185
 
    return GRUB_VIDEO_BLIT_FORMAT_1BIT_PACKED;
186
166
 
187
167
  /* Backup route.  Unknown format.  */
188
168
 
400
380
}
401
381
 
402
382
grub_err_t
403
 
grub_video_set_mode (const char *modestring,
 
383
grub_video_set_mode (char *modestring,
404
384
                     int NESTED_FUNC_ATTR (*hook) (grub_video_adapter_t p,
405
385
                                                   struct grub_video_mode_info *mode_info))
406
386
{
715
695
/* Initialize Video API module.  */
716
696
GRUB_MOD_INIT(video_video)
717
697
{
 
698
  grub_video_adapter_active = 0;
 
699
  grub_video_adapter_list = 0;
718
700
}
719
701
 
720
702
/* Finalize Video API module.  */