tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 7176a617: Merge "Don\'t use typedefs that hide *s."

Browse source 
* commit '7176a61718e7b45a8fde3a25eada0c9425d1dece':
  Don't use typedefs that hide *s.
This commit is contained in:
Elliott Hughes 2015-04-15 18:36:32 +00:00 committed by Android Git Automerger
commit 0a557b6bc2
8 changed files with 54 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
minui/graphics.cpp
View file

@ -326,7 +326,7 @@ static void gr_test() {
gr_clear(); gr_clear();
gr_color(255, 0, 0, 255); gr_color(255, 0, 0, 255);
gr_surface frame = images[x%frames]; GRSurface* frame = images[x%frames];
gr_blit(frame, 0, 0, frame->width, frame->height, x, 0); gr_blit(frame, 0, 0, frame->width, frame->height, x, 0);
gr_color(255, 0, 0, 128); gr_color(255, 0, 0, 128);

6
minui/graphics.h
View file

@ -21,13 +21,13 @@
// TODO: lose the function pointers. // TODO: lose the function pointers.
struct minui_backend { struct minui_backend {
// Initializes the backend and returns a gr_surface to draw into. // Initializes the backend and returns a GRSurface* to draw into.
gr_surface (*init)(minui_backend*); GRSurface* (*init)(minui_backend*);
// Causes the current drawing surface (returned by the most recent // Causes the current drawing surface (returned by the most recent
// call to flip() or init()) to be displayed, and returns a new // call to flip() or init()) to be displayed, and returns a new
// drawing surface. // drawing surface.
gr_surface (*flip)(minui_backend*); GRSurface* (*flip)(minui_backend*);
// Blank (or unblank) the screen. // Blank (or unblank) the screen.
void (*blank)(minui_backend*, bool); void (*blank)(minui_backend*, bool);

8
minui/graphics_adf.cpp
View file

@ -47,7 +47,7 @@ struct adf_pdata {
adf_surface_pdata surfaces[2]; adf_surface_pdata surfaces[2];
}; };
static gr_surface adf_flip(minui_backend *backend); static GRSurface* adf_flip(minui_backend *backend);
static void adf_blank(minui_backend *backend, bool blank); static void adf_blank(minui_backend *backend, bool blank);
static int adf_surface_init(adf_pdata *pdata, drm_mode_modeinfo *mode, adf_surface_pdata *surf) { static int adf_surface_init(adf_pdata *pdata, drm_mode_modeinfo *mode, adf_surface_pdata *surf) {
@ -134,12 +134,12 @@ static int adf_device_init(adf_pdata *pdata, adf_device *dev)
return err; return err;
} }
static gr_surface adf_init(minui_backend *backend) static GRSurface* adf_init(minui_backend *backend)
{ {
adf_pdata *pdata = (adf_pdata *)backend; adf_pdata *pdata = (adf_pdata *)backend;
adf_id_t *dev_ids = NULL; adf_id_t *dev_ids = NULL;
ssize_t n_dev_ids, i; ssize_t n_dev_ids, i;
gr_surface ret; GRSurface* ret;
#if defined(RECOVERY_ABGR) #if defined(RECOVERY_ABGR)
pdata->format = DRM_FORMAT_ABGR8888; pdata->format = DRM_FORMAT_ABGR8888;
@ -193,7 +193,7 @@ static gr_surface adf_init(minui_backend *backend)
return ret; return ret;
} }
static gr_surface adf_flip(minui_backend *backend) static GRSurface* adf_flip(minui_backend *backend)
{ {
adf_pdata *pdata = (adf_pdata *)backend; adf_pdata *pdata = (adf_pdata *)backend;
adf_surface_pdata *surf = &pdata->surfaces[pdata->current_surface]; adf_surface_pdata *surf = &pdata->surfaces[pdata->current_surface];

8
minui/graphics_fbdev.cpp
View file

@ -33,8 +33,8 @@
#include "minui.h" #include "minui.h"
#include "graphics.h" #include "graphics.h"
static gr_surface fbdev_init(minui_backend*); static GRSurface* fbdev_init(minui_backend*);
static gr_surface fbdev_flip(minui_backend*); static GRSurface* fbdev_flip(minui_backend*);
static void fbdev_blank(minui_backend*, bool); static void fbdev_blank(minui_backend*, bool);
static void fbdev_exit(minui_backend*); static void fbdev_exit(minui_backend*);
@ -79,7 +79,7 @@ static void set_displayed_framebuffer(unsigned n)
displayed_buffer = n; displayed_buffer = n;
} }
static gr_surface fbdev_init(minui_backend* backend) { static GRSurface* fbdev_init(minui_backend* backend) {
int fd = open("/dev/graphics/fb0", O_RDWR); int fd = open("/dev/graphics/fb0", O_RDWR);
if (fd == -1) { if (fd == -1) {
perror("cannot open fb0"); perror("cannot open fb0");
@ -174,7 +174,7 @@ static gr_surface fbdev_init(minui_backend* backend) {
return gr_draw; return gr_draw;
} }
static gr_surface fbdev_flip(minui_backend* backend __unused) { static GRSurface* fbdev_flip(minui_backend* backend __unused) {
if (double_buffered) { if (double_buffered) {
#if defined(RECOVERY_BGRA) #if defined(RECOVERY_BGRA)
// In case of BGRA, do some byte swapping // In case of BGRA, do some byte swapping

21
minui/minui.h
View file

@ -33,9 +33,6 @@ struct GRSurface {
unsigned char* data; unsigned char* data;
}; };
// TODO: remove this.
typedef GRSurface* gr_surface;
int gr_init(); int gr_init();
void gr_exit(); void gr_exit();
@ -49,13 +46,13 @@ void gr_clear(); // clear entire surface to current color
void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a); void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
void gr_fill(int x1, int y1, int x2, int y2); void gr_fill(int x1, int y1, int x2, int y2);
void gr_text(int x, int y, const char *s, bool bold); void gr_text(int x, int y, const char *s, bool bold);
void gr_texticon(int x, int y, gr_surface icon); void gr_texticon(int x, int y, GRSurface* icon);
int gr_measure(const char *s); int gr_measure(const char *s);
void gr_font_size(int *x, int *y); void gr_font_size(int *x, int *y);
void gr_blit(gr_surface source, int sx, int sy, int w, int h, int dx, int dy); void gr_blit(GRSurface* source, int sx, int sy, int w, int h, int dx, int dy);
unsigned int gr_get_width(gr_surface surface); unsigned int gr_get_width(GRSurface* surface);
unsigned int gr_get_height(gr_surface surface); unsigned int gr_get_height(GRSurface* surface);
// //
// Input events. // Input events.
@ -98,17 +95,17 @@ int ev_get_epollfd();
// All these functions load PNG images from "/res/images/${name}.png". // All these functions load PNG images from "/res/images/${name}.png".
// Load a single display surface from a PNG image. // Load a single display surface from a PNG image.
int res_create_display_surface(const char* name, gr_surface* pSurface); int res_create_display_surface(const char* name, GRSurface** pSurface);
// Load an array of display surfaces from a single PNG image. The PNG // Load an array of display surfaces from a single PNG image. The PNG
// should have a 'Frames' text chunk whose value is the number of // should have a 'Frames' text chunk whose value is the number of
// frames this image represents. The pixel data itself is interlaced // frames this image represents. The pixel data itself is interlaced
// by row. // by row.
int res_create_multi_display_surface(const char* name, int res_create_multi_display_surface(const char* name,
int* frames, gr_surface** pSurface); int* frames, GRSurface*** pSurface);
// Load a single alpha surface from a grayscale PNG image. // Load a single alpha surface from a grayscale PNG image.
int res_create_alpha_surface(const char* name, gr_surface* pSurface); int res_create_alpha_surface(const char* name, GRSurface** pSurface);
// Load part of a grayscale PNG image that is the first match for the // Load part of a grayscale PNG image that is the first match for the
// given locale. The image is expected to be a composite of multiple // given locale. The image is expected to be a composite of multiple
@ -117,10 +114,10 @@ int res_create_alpha_surface(const char* name, gr_surface* pSurface);
// development/tools/recovery_l10n for an app that will generate these // development/tools/recovery_l10n for an app that will generate these
// specialized images from Android resources. // specialized images from Android resources.
int res_create_localized_alpha_surface(const char* name, const char* locale, int res_create_localized_alpha_surface(const char* name, const char* locale,
gr_surface* pSurface); GRSurface** pSurface);
// Free a surface allocated by any of the res_create_*_surface() // Free a surface allocated by any of the res_create_*_surface()
// functions. // functions.
void res_free_surface(gr_surface surface); void res_free_surface(GRSurface* surface);
#endif #endif

36
minui/resources.cpp
View file

@ -36,11 +36,11 @@ extern char* locale;
#define SURFACE_DATA_ALIGNMENT 8 #define SURFACE_DATA_ALIGNMENT 8
static gr_surface malloc_surface(size_t data_size) { static GRSurface* malloc_surface(size_t data_size) {
size_t size = sizeof(GRSurface) + data_size + SURFACE_DATA_ALIGNMENT; size_t size = sizeof(GRSurface) + data_size + SURFACE_DATA_ALIGNMENT;
unsigned char* temp = reinterpret_cast<unsigned char*>(malloc(size)); unsigned char* temp = reinterpret_cast<unsigned char*>(malloc(size));
if (temp == NULL) return NULL; if (temp == NULL) return NULL;
gr_surface surface = (gr_surface) temp; GRSurface* surface = reinterpret_cast<GRSurface*>(temp);
surface->data = temp + sizeof(GRSurface) + surface->data = temp + sizeof(GRSurface) +
(SURFACE_DATA_ALIGNMENT - (sizeof(GRSurface) % SURFACE_DATA_ALIGNMENT)); (SURFACE_DATA_ALIGNMENT - (sizeof(GRSurface) % SURFACE_DATA_ALIGNMENT));
return surface; return surface;
@ -138,12 +138,10 @@ static int open_png(const char* name, png_structp* png_ptr, png_infop* info_ptr,
// framebuffer pixel format; they need to be modified if the // framebuffer pixel format; they need to be modified if the
// framebuffer format changes (but nothing else should). // framebuffer format changes (but nothing else should).
// Allocate and return a gr_surface sufficient for storing an image of // Allocate and return a GRSurface* sufficient for storing an image of
// the indicated size in the framebuffer pixel format. // the indicated size in the framebuffer pixel format.
static gr_surface init_display_surface(png_uint_32 width, png_uint_32 height) { static GRSurface* init_display_surface(png_uint_32 width, png_uint_32 height) {
gr_surface surface; GRSurface* surface = malloc_surface(width * height * 4);
surface = malloc_surface(width * height * 4);
if (surface == NULL) return NULL; if (surface == NULL) return NULL;
surface->width = width; surface->width = width;
@ -199,8 +197,8 @@ static void transform_rgb_to_draw(unsigned char* input_row,
} }
} }
int res_create_display_surface(const char* name, gr_surface* pSurface) { int res_create_display_surface(const char* name, GRSurface** pSurface) {
gr_surface surface = NULL; GRSurface* surface = NULL;
int result = 0; int result = 0;
png_structp png_ptr = NULL; png_structp png_ptr = NULL;
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
@ -239,8 +237,8 @@ int res_create_display_surface(const char* name, gr_surface* pSurface) {
return result; return result;
} }
int res_create_multi_display_surface(const char* name, int* frames, gr_surface** pSurface) { int res_create_multi_display_surface(const char* name, int* frames, GRSurface*** pSurface) {
gr_surface* surface = NULL; GRSurface** surface = NULL;
int result = 0; int result = 0;
png_structp png_ptr = NULL; png_structp png_ptr = NULL;
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
@ -275,7 +273,7 @@ int res_create_multi_display_surface(const char* name, int* frames, gr_surface**
goto exit; goto exit;
} }
surface = reinterpret_cast<gr_surface*>(malloc(*frames * sizeof(gr_surface))); surface = reinterpret_cast<GRSurface**>(malloc(*frames * sizeof(GRSurface*)));
if (surface == NULL) { if (surface == NULL) {
result = -8; result = -8;
goto exit; goto exit;
@ -302,7 +300,7 @@ int res_create_multi_display_surface(const char* name, int* frames, gr_surface**
} }
free(p_row); free(p_row);
*pSurface = (gr_surface*) surface; *pSurface = reinterpret_cast<GRSurface**>(surface);
exit: exit:
png_destroy_read_struct(&png_ptr, &info_ptr, NULL); png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@ -318,8 +316,8 @@ exit:
return result; return result;
} }
int res_create_alpha_surface(const char* name, gr_surface* pSurface) { int res_create_alpha_surface(const char* name, GRSurface** pSurface) {
gr_surface surface = NULL; GRSurface* surface = NULL;
int result = 0; int result = 0;
png_structp png_ptr = NULL; png_structp png_ptr = NULL;
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
@ -384,8 +382,8 @@ static int matches_locale(const char* loc, const char* locale) {
int res_create_localized_alpha_surface(const char* name, int res_create_localized_alpha_surface(const char* name,
const char* locale, const char* locale,
gr_surface* pSurface) { GRSurface** pSurface) {
gr_surface surface = NULL; GRSurface* surface = NULL;
int result = 0; int result = 0;
png_structp png_ptr = NULL; png_structp png_ptr = NULL;
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
@ -440,7 +438,7 @@ int res_create_localized_alpha_surface(const char* name,
memcpy(surface->data + i*w, row, w); memcpy(surface->data + i*w, row, w);
} }
*pSurface = (gr_surface) surface; *pSurface = reinterpret_cast<GRSurface*>(surface);
break; break;
} else { } else {
int i; int i;
@ -456,6 +454,6 @@ exit:
return result; return result;
} }
void res_free_surface(gr_surface surface) { void res_free_surface(GRSurface* surface) {
free(surface); free(surface);
} }

12
screen_ui.cpp
View file

@ -89,11 +89,11 @@ void ScreenRecoveryUI::draw_background_locked(Icon icon) {
gr_clear(); gr_clear();
if (icon) { if (icon) {
gr_surface surface = backgroundIcon[icon]; GRSurface* surface = backgroundIcon[icon];
if (icon == INSTALLING_UPDATE || icon == ERASING) { if (icon == INSTALLING_UPDATE || icon == ERASING) {
surface = installation[installingFrame]; surface = installation[installingFrame];
} }
gr_surface text_surface = backgroundText[icon]; GRSurface* text_surface = backgroundText[icon];
int iconWidth = gr_get_width(surface); int iconWidth = gr_get_width(surface);
int iconHeight = gr_get_height(surface); int iconHeight = gr_get_height(surface);
@ -132,7 +132,7 @@ void ScreenRecoveryUI::draw_progress_locked() {
if (currentIcon == ERROR) return; if (currentIcon == ERROR) return;
if (currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) { if (currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) {
gr_surface icon = installation[installingFrame]; GRSurface* icon = installation[installingFrame];
gr_blit(icon, 0, 0, gr_get_width(icon), gr_get_height(icon), iconX, iconY); gr_blit(icon, 0, 0, gr_get_width(icon), gr_get_height(icon), iconX, iconY);
} }
@ -357,21 +357,21 @@ void ScreenRecoveryUI::ProgressThreadLoop() {
} }
} }
void ScreenRecoveryUI::LoadBitmap(const char* filename, gr_surface* surface) { void ScreenRecoveryUI::LoadBitmap(const char* filename, GRSurface** surface) {
int result = res_create_display_surface(filename, surface); int result = res_create_display_surface(filename, surface);
if (result < 0) { if (result < 0) {
LOGE("missing bitmap %s\n(Code %d)\n", filename, result); LOGE("missing bitmap %s\n(Code %d)\n", filename, result);
} }
} }
void ScreenRecoveryUI::LoadBitmapArray(const char* filename, int* frames, gr_surface** surface) { void ScreenRecoveryUI::LoadBitmapArray(const char* filename, int* frames, GRSurface*** surface) {
int result = res_create_multi_display_surface(filename, frames, surface); int result = res_create_multi_display_surface(filename, frames, surface);
if (result < 0) { if (result < 0) {
LOGE("missing bitmap %s\n(Code %d)\n", filename, result); LOGE("missing bitmap %s\n(Code %d)\n", filename, result);
} }
} }
void ScreenRecoveryUI::LoadLocalizedBitmap(const char* filename, gr_surface* surface) { void ScreenRecoveryUI::LoadLocalizedBitmap(const char* filename, GRSurface** surface) {
int result = res_create_localized_alpha_surface(filename, locale, surface); int result = res_create_localized_alpha_surface(filename, locale, surface);
if (result < 0) { if (result < 0) {
LOGE("missing bitmap %s\n(Code %d)\n", filename, result); LOGE("missing bitmap %s\n(Code %d)\n", filename, result);

20
screen_ui.h
View file

@ -73,13 +73,13 @@ class ScreenRecoveryUI : public RecoveryUI {
bool rtl_locale; bool rtl_locale;
pthread_mutex_t updateMutex; pthread_mutex_t updateMutex;
gr_surface backgroundIcon[5]; GRSurface* backgroundIcon[5];
gr_surface backgroundText[5]; GRSurface* backgroundText[5];
gr_surface *installation; GRSurface** installation;
gr_surface progressBarEmpty; GRSurface* progressBarEmpty;
gr_surface progressBarFill; GRSurface* progressBarFill;
gr_surface stageMarkerEmpty; GRSurface* stageMarkerEmpty;
gr_surface stageMarkerFill; GRSurface* stageMarkerFill;
ProgressType progressBarType; ProgressType progressBarType;
@ -127,9 +127,9 @@ class ScreenRecoveryUI : public RecoveryUI {
void DrawTextLine(int* y, const char* line, bool bold); void DrawTextLine(int* y, const char* line, bool bold);
void DrawTextLines(int* y, const char* const* lines); void DrawTextLines(int* y, const char* const* lines);
void LoadBitmap(const char* filename, gr_surface* surface); void LoadBitmap(const char* filename, GRSurface** surface);
void LoadBitmapArray(const char* filename, int* frames, gr_surface** surface); void LoadBitmapArray(const char* filename, int* frames, GRSurface*** surface);
void LoadLocalizedBitmap(const char* filename, gr_surface* surface); void LoadLocalizedBitmap(const char* filename, GRSurface** surface);
}; };
#endif // RECOVERY_UI_H #endif // RECOVERY_UI_H