efi/gop: Convert GOP structures to typedef and clean up some types

Use typedef for the GOP structures, in anticipation of unifying 32/64-bit code. Also use more appropriate types in the non-bitness specific structures for the framebuffer address and pointers.

Arvind Sankar committed 6 years ago

Commit 44c84b41 parent 6c895c22 files · +36 −36Browse files

Showing the changes to include/linux (1 of 2 files). Show all

Unified · Split

include/linux/efi.h+23−23

@@ -1415,69 +1415,69 @@ struct efi_simple_text_output_protocol { · 1414 unmodified lines
1415	#define PIXEL_BLT_ONLY 3	1415	#define PIXEL_BLT_ONLY 3
1416	#define PIXEL_FORMAT_MAX 4	1416	#define PIXEL_FORMAT_MAX 4
1417		1417
1418	struct efi_pixel_bitmask {	1418	typedef struct {
1419	u32 red_mask;	1419	u32 red_mask;
1420	u32 green_mask;	1420	u32 green_mask;
1421	u32 blue_mask;	1421	u32 blue_mask;
1422	u32 reserved_mask;	1422	u32 reserved_mask;
1423	};	1423	} efi_pixel_bitmask_t;
1424		1424
1425	struct efi_graphics_output_mode_info {	1425	typedef struct {
1426	u32 version;	1426	u32 version;
1427	u32 horizontal_resolution;	1427	u32 horizontal_resolution;
1428	u32 vertical_resolution;	1428	u32 vertical_resolution;
1429	int pixel_format;	1429	int pixel_format;
1430	struct efi_pixel_bitmask pixel_information;	1430	efi_pixel_bitmask_t pixel_information;
1431	u32 pixels_per_scan_line;	1431	u32 pixels_per_scan_line;
1432	};	1432	} efi_graphics_output_mode_info_t;
1433		1433
1434	struct efi_graphics_output_protocol_mode_32 {	1434	typedef struct {
1435	u32 max_mode;	1435	u32 max_mode;
1436	u32 mode;	1436	u32 mode;
1437	u32 info;	1437	u32 info;
1438	u32 size_of_info;	1438	u32 size_of_info;
1439	u64 frame_buffer_base;	1439	u64 frame_buffer_base;
1440	u32 frame_buffer_size;	1440	u32 frame_buffer_size;
1441	};	1441	} efi_graphics_output_protocol_mode_32_t;
1442		1442
1443	struct efi_graphics_output_protocol_mode_64 {	1443	typedef struct {
1444	u32 max_mode;	1444	u32 max_mode;
1445	u32 mode;	1445	u32 mode;
1446	u64 info;	1446	u64 info;
1447	u64 size_of_info;	1447	u64 size_of_info;
1448	u64 frame_buffer_base;	1448	u64 frame_buffer_base;
1449	u64 frame_buffer_size;	1449	u64 frame_buffer_size;
1450	};	1450	} efi_graphics_output_protocol_mode_64_t;
1451		1451
1452	struct efi_graphics_output_protocol_mode {	1452	typedef struct {
1453	u32 max_mode;	1453	u32 max_mode;
1454	u32 mode;	1454	u32 mode;
1455	unsigned long info;	1455	efi_graphics_output_mode_info_t *info;
1456	unsigned long size_of_info;	1456	unsigned long size_of_info;
1457	u64 frame_buffer_base;	1457	efi_physical_addr_t frame_buffer_base;
1458	unsigned long frame_buffer_size;	1458	unsigned long frame_buffer_size;
1459	};	1459	} efi_graphics_output_protocol_mode_t;
1460		1460
1461	struct efi_graphics_output_protocol_32 {	1461	typedef struct {
1462	u32 query_mode;	1462	u32 query_mode;
1463	u32 set_mode;	1463	u32 set_mode;
1464	u32 blt;	1464	u32 blt;
1465	u32 mode;	1465	u32 mode;
1466	};	1466	} efi_graphics_output_protocol_32_t;
1467		1467
1468	struct efi_graphics_output_protocol_64 {	1468	typedef struct {
1469	u64 query_mode;	1469	u64 query_mode;
1470	u64 set_mode;	1470	u64 set_mode;
1471	u64 blt;	1471	u64 blt;
1472	u64 mode;	1472	u64 mode;
1473	};	1473	} efi_graphics_output_protocol_64_t;
1474		1474
1475	struct efi_graphics_output_protocol {	1475	typedef struct {
1476	unsigned long query_mode;	1476	void *query_mode;
1477	unsigned long set_mode;	1477	void *set_mode;
1478	unsigned long blt;	1478	void *blt;
1479	struct efi_graphics_output_protocol_mode *mode;	1479	efi_graphics_output_protocol_mode_t *mode;
1480	};	1480	} efi_graphics_output_protocol_t;
1481		1481
1482	extern struct list_head efivar_sysfs_list;	1482	extern struct list_head efivar_sysfs_list;
1483		1483