[haiku-commits] haiku: hrev47554 - headers/private/kernel/arch/arm
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 23 Jul 2014 13:27:51 +0200 (CEST)
hrev47554 adds 1 changeset to branch 'master'
old head: 8bfb76fe239ffbd9e49d4e8943b603ef4b8c754d
new head: c8826605dfe3bff9d9fc139247b1f04dbc1e30e0
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=c882660+%5E8bfb76f
----------------------------------------------------------------------------
c882660: Guard header for use by assembler code
Somehow it ends up being used by shell.S for the verdex bootstrap.
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47554
Commit: c8826605dfe3bff9d9fc139247b1f04dbc1e30e0
URL: http://cgit.haiku-os.org/haiku/commit/?id=c882660
Author: François Revol <revol@xxxxxxx>
Date: Tue Jul 22 10:30:01 2014 UTC
----------------------------------------------------------------------------
1 file changed, 8 insertions(+)
headers/private/kernel/arch/arm/pxa270.h | 8 ++++++++
----------------------------------------------------------------------------
diff --git a/headers/private/kernel/arch/arm/pxa270.h
b/headers/private/kernel/arch/arm/pxa270.h
index 97d9360..1c878bf 100644
--- a/headers/private/kernel/arch/arm/pxa270.h
+++ b/headers/private/kernel/arch/arm/pxa270.h
@@ -72,6 +72,8 @@
/* DMA controller */
+#ifndef _ASSEMBLER
+
typedef struct pxa27x_dma_descriptor {
uint32 ddadr;
uint32 dsadr;
@@ -79,6 +81,8 @@ typedef struct pxa27x_dma_descriptor {
uint32 dcmd;
} pxa27x_dma_descriptor __attribute__ ((aligned(16)));
+#endif // !_ASSEMBLER
+
/* LCD controller */
#define LCC_BASE 0x44000000
@@ -106,6 +110,8 @@ typedef struct pxa27x_dma_descriptor {
#define FBR0 (LCC_BASE+0x020)
#define FSADR0 (LCC_BASE+0x204)
+#ifndef _ASSEMBLER
+
typedef struct pxa27x_lcd_dma_descriptor {
uint32 fdadr;
uint32 fsadr;
@@ -113,4 +119,6 @@ typedef struct pxa27x_lcd_dma_descriptor {
uint32 ldcmd;
} pxa27x_lcd_dma_descriptor __attribute__ ((aligned(16)));
+#endif // !_ASSEMBLER
+
#endif /* __PLATFORM_PXA270_H */
Other related posts:
