Merge commit 'hpa/master' into for-erwan

Conflicts:
	com32/cmenu/libmenu/com32io.h
	com32/gplinclude/dmi/dmi.h
	com32/gplinclude/dmi/dmi_base_board.h
	com32/gplinclude/dmi/dmi_memory.h
	com32/gplinclude/dmi/dmi_system.h
	com32/gpllib/dmi/dmi.c
	com32/gpllib/dmi/dmi_memory.c
	com32/include/sys/pci.h
	com32/lib/pci/scan.c
	com32/modules/Makefile

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

1 files changed, 20 insertions, 20 deletions

diff --git a/com32/gplinclude/dmi/dmi_base_board.h b/com32/gplinclude/dmi/dmi_base_board.h
index f12cc222..ff4dd8a9 100644
--- a/com32/gplinclude/dmi/dmi_base_board.h
+++ b/com32/gplinclude/dmi/dmi_base_board.h
@@ -30,29 +30,29 @@ extern const char *base_board_features_strings[];
 /* this struct have BASE_BOARD_NB_ELEMENTS */
 /* each bool is associated to the relevant message above */
 typedef struct {
-bool hosting;
-bool board_needs_daughter;
-bool removable;
-bool replaceable;
-bool hot_swappable;
-} __attribute__((__packed__)) s_base_board_features;
+	bool hosting;
+	bool board_needs_daughter;
+	bool removable;
+	bool replaceable;
+	bool hot_swappable;
+} __attribute__ ((__packed__)) s_base_board_features;
 
 typedef struct {
-char manufacturer[BASE_BOARD_MANUFACTURER_SIZE];
-char product_name[BASE_BOARD_PRODUCT_NAME_SIZE];
-char version[BASE_BOARD_VERSION_SIZE];
-char serial[BASE_BOARD_SERIAL_SIZE];
-char asset_tag[BASE_BOARD_ASSET_TAG_SIZE];
-char location[BASE_BOARD_LOCATION_SIZE];
-char type[BASE_BOARD_TYPE_SIZE];
-s_base_board_features features;
+	char manufacturer[BASE_BOARD_MANUFACTURER_SIZE];
+	char product_name[BASE_BOARD_PRODUCT_NAME_SIZE];
+	char version[BASE_BOARD_VERSION_SIZE];
+	char serial[BASE_BOARD_SERIAL_SIZE];
+	char asset_tag[BASE_BOARD_ASSET_TAG_SIZE];
+	char location[BASE_BOARD_LOCATION_SIZE];
+	char type[BASE_BOARD_TYPE_SIZE];
+	s_base_board_features features;
 /* The filled field have to be set to true when the dmitable implement that item */
-bool filled;
-struct {
-	char type[16];
-	uint8_t status;
-	char description[10];
-} devices_information[10];
+	bool filled;
+	struct {
+		char type[16];
+		uint8_t status;
+		char description[10];
+	} devices_information[10];
 } s_base_board;
 
 #endif