An almost mechanical sweep to replace C++ style comments with C

style comments. This is not an attempt to conform to style(9).
Such has lower priority.

1 files changed, 49 insertions, 50 deletions

diff --git a/sys/boot/efi/include/efiprot.h b/sys/boot/efi/include/efiprot.h
index ddbcefd..d81d605 100644
--- a/sys/boot/efi/include/efiprot.h
+++ b/sys/boot/efi/include/efiprot.h
@@ -20,17 +20,17 @@ Revision History
 
 --*/
 
-//
-// Device Path protocol
-//
+/*
+ * Device Path protocol
+ */
 
 #define DEVICE_PATH_PROTOCOL    \
     { 0x9576e91, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
 
 
-//
-// Block IO protocol
-//
+/*
+ * Block IO protocol
+ */
 
 #define BLOCK_IO_PROTOCOL \
     { 0x964e5b21, 0x6459, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
@@ -104,9 +104,9 @@ typedef struct _EFI_BLOCK_IO {
 
 
 
-//
-// Disk Block IO protocol
-//
+/*
+ * Disk Block IO protocol
+ */
 
 #define DISK_IO_PROTOCOL \
     { 0xce345171, 0xba0b, 0x11d2,  0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
@@ -143,9 +143,9 @@ typedef struct _EFI_DISK_IO {
 } EFI_DISK_IO;
 
 
-//
-// Simple filesystem protocol
-//
+/*
+ * Simple filesystem protocol
+ */
 
 #define SIMPLE_FILE_SYSTEM_PROTOCOL \
     { 0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
@@ -167,10 +167,6 @@ typedef struct _EFI_FILE_IO_INTERFACE {
     EFI_VOLUME_OPEN         OpenVolume;
 } EFI_FILE_IO_INTERFACE;
 
-//
-//
-//
-
 typedef
 EFI_STATUS
 (EFIAPI *EFI_FILE_OPEN) (
@@ -181,12 +177,12 @@ EFI_STATUS
     IN UINT64                   Attributes
     );
 
-// Open modes
+/* Open modes */
 #define EFI_FILE_MODE_READ      0x0000000000000001
 #define EFI_FILE_MODE_WRITE     0x0000000000000002
 #define EFI_FILE_MODE_CREATE    0x8000000000000000
 
-// File attributes
+/* File attributes */
 #define EFI_FILE_READ_ONLY      0x0000000000000001
 #define EFI_FILE_HIDDEN         0x0000000000000002
 #define EFI_FILE_SYSTEM         0x0000000000000004
@@ -279,9 +275,9 @@ typedef struct _EFI_FILE_HANDLE {
 } EFI_FILE, *EFI_FILE_HANDLE;
 
 
-//
-// File information types
-//
+/*
+ * File information types
+ */
 
 #define EFI_FILE_INFO_ID   \
     { 0x9576e92, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
@@ -297,13 +293,14 @@ typedef struct {
     CHAR16                  FileName[1];
 } EFI_FILE_INFO;
 
-//
-// The FileName field of the EFI_FILE_INFO data structure is variable length.
-// Whenever code needs to know the size of the EFI_FILE_INFO data structure, it needs to
-// be the size of the data structure without the FileName field.  The following macro 
-// computes this size correctly no matter how big the FileName array is declared.
-// This is required to make the EFI_FILE_INFO data structure ANSI compilant. 
-//
+/*
+ * The FileName field of the EFI_FILE_INFO data structure is variable length.
+ * Whenever code needs to know the size of the EFI_FILE_INFO data structure,
+ * it needs to be the size of the data structure without the FileName field.
+ * The following macro computes this size correctly no matter how big the
+ * FileName array is declared. This is required to make the EFI_FILE_INFO
+ * data structure ANSI compliant. 
+ */
 
 #define SIZE_OF_EFI_FILE_INFO EFI_FIELD_OFFSET(EFI_FILE_INFO,FileName)
 
@@ -319,13 +316,15 @@ typedef struct {
     CHAR16                  VolumeLabel[1];
 } EFI_FILE_SYSTEM_INFO;
 
-//
-// The VolumeLabel field of the EFI_FILE_SYSTEM_INFO data structure is variable length.
-// Whenever code needs to know the size of the EFI_FILE_SYSTEM_INFO data structure, it needs
-// to be the size of the data structure without the VolumeLable field.  The following macro 
-// computes this size correctly no matter how big the VolumeLable array is declared.
-// This is required to make the EFI_FILE_SYSTEM_INFO data structure ANSI compilant. 
-//
+/*
+ * The VolumeLabel field of the EFI_FILE_SYSTEM_INFO data structure is
+ * variable length. Whenever code needs to know the size of the
+ * EFI_FILE_SYSTEM_INFO data structure, it needs to be the size of the data
+ * structure without the VolumeLable field.  The following macro computes
+ * this size correctly no matter how big the VolumeLable array is declared.
+ * This is required to make the EFI_FILE_SYSTEM_INFO data structure ANSI
+ * compilant. 
+ */
 
 #define SIZE_OF_EFI_FILE_SYSTEM_INFO EFI_FIELD_OFFSET(EFI_FILE_SYSTEM_INFO,VolumeLabel)
 
@@ -338,10 +337,9 @@ typedef struct {
 
 #define SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO EFI_FIELD_OFFSET(EFI_FILE_SYSTEM_VOLUME_LABEL_INFO,VolumeLabel)
 
-//
-// Load file protocol
-//
-
+/*
+ * Load file protocol
+ */
 
 #define LOAD_FILE_PROTOCOL \
     { 0x56EC3091, 0x954C, 0x11d2, 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }
@@ -363,9 +361,9 @@ typedef struct _EFI_LOAD_FILE_INTERFACE {
 } EFI_LOAD_FILE_INTERFACE;
 
 
-//
-// Device IO protocol
-//
+/*
+ * Device IO protocol
+ */
 
 #define DEVICE_IO_PROTOCOL \
     { 0xaf6ac311, 0x84c3, 0x11d2, 0x8e, 0x3c, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }
@@ -377,9 +375,10 @@ typedef enum {
     IO_UINT16,
     IO_UINT32,
     IO_UINT64,
-//
-// Specification Change: Copy from MMIO to MMIO vs. MMIO to buffer, buffer to MMIO
-//
+/*
+ * Specification Change: Copy from MMIO to MMIO vs. MMIO to buffer, buffer to
+ * MMIO
+ */
     MMIO_COPY_UINT8,
     MMIO_COPY_UINT16,
     MMIO_COPY_UINT32,
@@ -474,9 +473,9 @@ typedef struct _EFI_DEVICE_IO_INTERFACE {
 } EFI_DEVICE_IO_INTERFACE;
 
 
-//
-// Unicode Collation protocol
-//
+/*
+ * Unicode Collation protocol
+ */
 
 #define UNICODE_COLLATION_PROTOCOL \
     { 0x1d85cd7f, 0xf43d, 0x11d2, 0x9a, 0xc,  0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
@@ -536,13 +535,13 @@ BOOLEAN
 
 typedef struct _EFI_UNICODE_COLLATION_INTERFACE {
 
-    // general
+	/* general */
     EFI_UNICODE_STRICOLL                StriColl;
     EFI_UNICODE_METAIMATCH              MetaiMatch;
     EFI_UNICODE_STRLWR                  StrLwr;
     EFI_UNICODE_STRUPR                  StrUpr;
 
-    // for supporting fat volumes
+	/* for supporting fat volumes */
     EFI_UNICODE_FATTOSTR                FatToStr;
     EFI_UNICODE_STRTOFAT                StrToFat;