[haiku-commits] haiku: hrev45211 - src/add-ons/kernel/partitioning_systems/gpt
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 27 Jan 2013 20:35:01 +0100 (CET)
hrev45211 adds 2 changesets to branch 'master'
old head: 2e6221ff11bf30e2b3c5bf604b43ad1ff924928b
new head: 5257160668005086169d9431a56baf55f40dc54e
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=5257160+%5E2e6221f
----------------------------------------------------------------------------
e9cdc31: gpt: Fixed incorrect revision.
5257160: gpt: Fixed boot loader build.
* Thanks, Alex!
[ Axel Dörfler <axeld@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 14 insertions(+), 14 deletions(-)
.../kernel/partitioning_systems/gpt/Header.cpp | 20 ++++++++++----------
.../kernel/partitioning_systems/gpt/Header.h | 4 ++--
.../kernel/partitioning_systems/gpt/efi_gpt.h | 4 ++--
############################################################################
Commit: e9cdc3129e0c3e9b9ee8007e8e90abe435156e07
URL: http://cgit.haiku-os.org/haiku/commit/?id=e9cdc31
Author: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date: Sun Jan 27 19:33:03 2013 UTC
gpt: Fixed incorrect revision.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/partitioning_systems/gpt/efi_gpt.h
b/src/add-ons/kernel/partitioning_systems/gpt/efi_gpt.h
index 2de5e9a..50e1043 100644
--- a/src/add-ons/kernel/partitioning_systems/gpt/efi_gpt.h
+++ b/src/add-ons/kernel/partitioning_systems/gpt/efi_gpt.h
@@ -31,8 +31,8 @@ struct efi_table_header {
// the rest of the block is reserved
- void SetRevision(uint32 revision)
- { revision = B_HOST_TO_LENDIAN_INT32(revision); }
+ void SetRevision(uint32 newRevision)
+ { revision = B_HOST_TO_LENDIAN_INT32(newRevision); }
uint32 Revision() const
{ return B_LENDIAN_TO_HOST_INT32(revision); }
void SetHeaderSize(uint32 size)
############################################################################
Revision: hrev45211
Commit: 5257160668005086169d9431a56baf55f40dc54e
URL: http://cgit.haiku-os.org/haiku/commit/?id=5257160
Author: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date: Sun Jan 27 19:33:48 2013 UTC
gpt: Fixed boot loader build.
* Thanks, Alex!
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/partitioning_systems/gpt/Header.cpp
b/src/add-ons/kernel/partitioning_systems/gpt/Header.cpp
index 55ccb82..96a952c 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 f3681df..e1bb020 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();
Other related posts:
- » [haiku-commits] haiku: hrev45211 - src/add-ons/kernel/partitioning_systems/gpt - axeld
