Changeset 25a76ab8 in mainline for boot/generic/include/align.h

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/generic/include/align.h (moved) (moved from boot/generic/align.h ) (3 diffs)

boot/generic/include/align.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2005 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup generic
- * @{
- */
-/** @file
+/**
+ * @file
+ * @brief Macros for making values and addresses aligned.
  */
 
@@ -36 +35 @@
 #define BOOT_ALIGN_H_
 
+/** Align to the nearest lower address.
+ *
+ * @param s Address or size to be aligned.
+ * @param a Size of alignment, must be power of 2.
+ */
+#define ALIGN_DOWN(s, a)  ((s) & ~((a) - 1))
+
 /** Align to the nearest higher address.
  *
- * @param addr  Address or size to be aligned.
- * @param align Size of alignment, must be power of 2.
+ * @param s Address or size to be aligned.
+ * @param a Size of alignment, must be power of 2.
  */
-#define ALIGN_UP(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
+#define ALIGN_UP(s, a)  (((s) + ((a) - 1)) & ~((a) - 1))
 
 #endif