From 5257160668005086169d9431a56baf55f40dc54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 27 Jan 2013 20:33:48 +0100 Subject: [PATCH] gpt: Fixed boot loader build. * Thanks, Alex! --- .../partitioning_systems/gpt/Header.cpp | 20 +++++++++---------- .../kernel/partitioning_systems/gpt/Header.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/add-ons/kernel/partitioning_systems/gpt/Header.cpp b/src/add-ons/kernel/partitioning_systems/gpt/Header.cpp index 55ccb82b31..96a952c359 100644 --- a/src/add-ons/kernel/partitioning_systems/gpt/Header.cpp +++ b/src/add-ons/kernel/partitioning_systems/gpt/Header.cpp @@ -250,6 +250,16 @@ Header::_Write(int fd, off_t offset, const void* data, size_t size) const } +void +Header::_UpdateCRC() +{ + fHeader.SetEntriesCRC(crc32(fEntries, _EntryArraySize())); + fHeader.SetHeaderCRC(0); + fHeader.SetHeaderCRC(crc32((uint8*)&fHeader, sizeof(efi_table_header))); +} +#endif // !_BOOT_MODE + + status_t Header::_Read(int fd, off_t offset, void* data, size_t size) const { @@ -263,16 +273,6 @@ Header::_Read(int fd, off_t offset, void* data, size_t size) const } -void -Header::_UpdateCRC() -{ - fHeader.SetEntriesCRC(crc32(fEntries, _EntryArraySize())); - fHeader.SetHeaderCRC(0); - fHeader.SetHeaderCRC(crc32((uint8*)&fHeader, sizeof(efi_table_header))); -} -#endif // !_BOOT_MODE - - bool Header::_IsHeaderValid(const efi_table_header& header, uint64 block) { diff --git a/src/add-ons/kernel/partitioning_systems/gpt/Header.h b/src/add-ons/kernel/partitioning_systems/gpt/Header.h index f3681df349..e1bb020edd 100644 --- a/src/add-ons/kernel/partitioning_systems/gpt/Header.h +++ b/src/add-ons/kernel/partitioning_systems/gpt/Header.h @@ -47,11 +47,11 @@ private: status_t _WriteHeader(int fd); status_t _Write(int fd, off_t offset, const void* data, size_t size) const; - status_t _Read(int fd, off_t offset, void* data, - size_t size) const; void _UpdateCRC(); #endif + status_t _Read(int fd, off_t offset, void* data, + size_t size) const; bool _IsHeaderValid(const efi_table_header& header, uint64 block); bool _ValidateHeaderCRC();