1c1
< /* $FreeBSD: head/sys/boot/efi/include/efiprot.h 96893 2002-05-19 03:17:22Z marcel $ */
---
> /* $FreeBSD: head/sys/boot/efi/include/efiprot.h 163898 2006-11-02 02:42:48Z marcel $ */
7c7,14
< Copyright (c) 1998 Intel Corporation
---
> Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved
> This software and associated documentation (if any) is furnished
> under a license and may only be used or copied in accordance
> with the terms of the license. Except as permitted by such
> license, no part of this software or documentation may be
> reproduced, stored in a retrieval system, or transmitted in any
> form or by any means without the express written consent of
> Intel Corporation.
23,25c30,32
< /*
< * Device Path protocol
< */
---
> //
> // Device Path protocol
> //
31,33c38,40
< /*
< * Block IO protocol
< */
---
> //
> // Block IO protocol
> //
107,109c114,116
< /*
< * Disk Block IO protocol
< */
---
> //
> // Disk Block IO protocol
> //
146,148c153,155
< /*
< * Simple filesystem protocol
< */
---
> //
> // Simple file system protocol
> //
169a177,180
> //
> //
> //
>
180c191
< /* Open modes */
---
> // Open modes
185c196
< /* File attributes */
---
> // File attributes
278,280c289,291
< /*
< * File information types
< */
---
> //
> // File information types
> //
296,303c307,313
< /*
< * 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.
< */
---
> //
> // 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.
> //
319,327c329,335
< /*
< * 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.
> //
340,342c348,350
< /*
< * Load file protocol
< */
---
> //
> // Load file protocol
> //
343a352
>
364,366c373,375
< /*
< * Device IO protocol
< */
---
> //
> // Device IO protocol
> //
378,381c387,389
< /*
< * 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
> //
388,389c396,397
< #define EFI_PCI_ADDRESS(_bus,_dev,_func) \
< ( (UINT64) ( (((UINTN)_bus) << 24) + (((UINTN)_dev) << 16) + (((UINTN)_func) << 8) ) )
---
> #define EFI_PCI_ADDRESS(bus,dev,func,reg) \
> ( (UINT64) ( (((UINTN)bus) << 24) + (((UINTN)dev) << 16) + (((UINTN)func) << 8) + ((UINTN)reg) ))
391d398
<
476,478c483,485
< /*
< * Unicode Collation protocol
< */
---
> //
> // Unicode Collation protocol
> //
489c496
< (EFIAPI *EFI_UNICODE_STRICOLL) (
---
> (EFIAPI *EFI_UNICODE_COLLATION_STRICOLL) (
497c504
< (EFIAPI *EFI_UNICODE_METAIMATCH) (
---
> (EFIAPI *EFI_UNICODE_COLLATION_METAIMATCH) (
505c512
< (EFIAPI *EFI_UNICODE_STRLWR) (
---
> (EFIAPI *EFI_UNICODE_COLLATION_STRLWR) (
512c519
< (EFIAPI *EFI_UNICODE_STRUPR) (
---
> (EFIAPI *EFI_UNICODE_COLLATION_STRUPR) (
519c526
< (EFIAPI *EFI_UNICODE_FATTOSTR) (
---
> (EFIAPI *EFI_UNICODE_COLLATION_FATTOSTR) (
528c535
< (EFIAPI *EFI_UNICODE_STRTOFAT) (
---
> (EFIAPI *EFI_UNICODE_COLLATION_STRTOFAT) (
538,542c545,549
< /* general */
< EFI_UNICODE_STRICOLL StriColl;
< EFI_UNICODE_METAIMATCH MetaiMatch;
< EFI_UNICODE_STRLWR StrLwr;
< EFI_UNICODE_STRUPR StrUpr;
---
> // general
> EFI_UNICODE_COLLATION_STRICOLL StriColl;
> EFI_UNICODE_COLLATION_METAIMATCH MetaiMatch;
> EFI_UNICODE_COLLATION_STRLWR StrLwr;
> EFI_UNICODE_COLLATION_STRUPR StrUpr;
544,546c551,553
< /* for supporting fat volumes */
< EFI_UNICODE_FATTOSTR FatToStr;
< EFI_UNICODE_STRTOFAT StrToFat;
---
> // for supporting fat volumes
> EFI_UNICODE_COLLATION_FATTOSTR FatToStr;
> EFI_UNICODE_COLLATION_STRTOFAT StrToFat;