Remove the definition of struct mca_guid and use the generic

struct uuid defined in <sys/uuid.h>.

Use uuid/UUID instead of guid/GUID to emphasize that the
identifiers are DCE version 1 identifiers and also to avoid
inconsistencies as much a possible.

4 files changed, 21 insertions, 25 deletions

diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c
index aac3146..fdd3adc 100644
--- a/sys/ia64/ia64/machdep.c
+++ b/sys/ia64/ia64/machdep.c
@@ -58,6 +58,7 @@
 #include <sys/linker.h>
 #include <sys/random.h>
 #include <sys/cons.h>
+#include <sys/uuid.h>
 #include <net/netisr.h>
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
diff --git a/sys/ia64/ia64/mca.c b/sys/ia64/ia64/mca.c
index 74fda97..837d561 100644
--- a/sys/ia64/ia64/mca.c
+++ b/sys/ia64/ia64/mca.c
@@ -33,6 +33,7 @@
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
+#include <sys/uuid.h>
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 #include <machine/mca.h>
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
index 4eb141c..e6865eb 100644
--- a/sys/ia64/ia64/mp_machdep.c
+++ b/sys/ia64/ia64/mp_machdep.c
@@ -37,6 +37,7 @@
 #include <sys/pcpu.h>
 #include <sys/smp.h>
 #include <sys/sysctl.h>
+#include <sys/uuid.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/ia64/include/mca.h b/sys/ia64/include/mca.h
index 10719d7..97c5611 100644
--- a/sys/ia64/include/mca.h
+++ b/sys/ia64/include/mca.h
@@ -29,13 +29,6 @@
 #ifndef _MACHINE_MCA_H_
 #define _MACHINE_MCA_H_
 
-struct mca_guid {
-	uint32_t	data1;
-	uint16_t	data2;
-	uint16_t	data3;
-	uint8_t		data4[8];
-};
-
 struct mca_record_header {
 	uint64_t	rh_seqnr;		/* Record id. */
 	uint8_t		rh_major;		/* BCD (=02). */
@@ -55,11 +48,11 @@ struct mca_record_header {
 #define	MCA_RH_TIME_MON		5
 #define	MCA_RH_TIME_YEAR	6
 #define	MCA_RH_TIME_CENT	7
-	struct mca_guid	rh_platform;		/* XXX not really a GUID. */
+	struct uuid	rh_platform;
 };
 
 struct mca_section_header {
-	struct mca_guid	sh_guid;
+	struct uuid	sh_uuid;
 	uint8_t		sh_major;		/* BCD (=02). */
 	uint8_t		sh_minor;		/* BCD (=00). */
 	uint8_t		sh_flags;
@@ -163,7 +156,7 @@ struct mca_mem_record {
 	uint64_t	mem_rspid;
 	uint64_t	mem_tgtid;
 	uint64_t	mem_busdata;
-	struct mca_guid	mem_oem_id;		/* XXX not really a GUID. */
+	struct uuid	mem_oem_id;
 	uint16_t	mem_oem_length;		/* Size of OEM data. */
 	/* N bytes of OEM platform data. */
 };
@@ -191,7 +184,7 @@ struct mca_pcibus_record {
 	uint64_t	pcibus_reqid;
 	uint64_t	pcibus_rspid;
 	uint64_t	pcibus_tgtid;
-	struct mca_guid	pcibus_oem_id;		/* XXX not really a GUID. */
+	struct uuid	pcibus_oem_id;
 	uint16_t	pcibus_oem_length;	/* Size of OEM data. */
 	/* N bytes of OEM platform data. */
 };
@@ -228,20 +221,20 @@ struct mca_pcidev_reg {
 	uint64_t	pcidev_reg_data;
 };
 
-#define	MCA_GUID_CPU		\
-	{0xe429faf1,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_GUID_MEMORY		\
-	{0xe429faf2,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_GUID_SEL		\
-	{0xe429faf3,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_GUID_PCI_BUS	\
-	{0xe429faf4,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_GUID_SMBIOS		\
-	{0xe429faf5,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_GUID_PCI_DEV	\
-	{0xe429faf6,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_GUID_GENERIC	\
-	{0xe429faf7,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}}
+#define	MCA_UUID_CPU		\
+	{0xe429faf1,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
+#define	MCA_UUID_MEMORY		\
+	{0xe429faf2,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
+#define	MCA_UUID_SEL		\
+	{0xe429faf3,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
+#define	MCA_UUID_PCI_BUS	\
+	{0xe429faf4,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
+#define	MCA_UUID_SMBIOS		\
+	{0xe429faf5,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
+#define	MCA_UUID_PCI_DEV	\
+	{0xe429faf6,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
+#define	MCA_UUID_GENERIC	\
+	{0xe429faf7,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
 
 #ifdef _KERNEL