Changeset d558bc49 in rtems

Timestamp:

11/08/11 10:08:14 (12 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

d922dab

Parents:

edb1dd83

Message:

2011-11-08 Sebastian Huber <sebastian.huber@…>

• include/utility.h: Fixed some casts.
• include/irq-generic.h: Define bsp_interrupt_handler_index_type conditionally.

Location:

c/src/lib/libbsp/shared

Files:

• ChangeLog (modified) (1 diff)
• include/irq-generic.h (modified) (2 diffs)
• include/utility.h (modified) (7 diffs)

c/src/lib/libbsp/shared/ChangeLog

@@ +1 @@
+2011-11-08      Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+        * include/utility.h: Fixed some casts.
+        * include/irq-generic.h: Define bsp_interrupt_handler_index_type
+        conditionally.
+
 2011-11-07      Sebastian Huber <sebastian.huber@embedded-brains.de>
 

c/src/lib/libbsp/shared/include/irq-generic.h

@@ -66 +66 @@
 
 #ifdef BSP_INTERRUPT_USE_INDEX_TABLE
+  #if BSP_INTERRUPT_HANDLER_TABLE_SIZE < 0x100
+    typedef uint8_t bsp_interrupt_handler_index_type;
+  #elif BSP_INTERRUPT_HANDLER_TABLE_SIZE < 0x10000
+    typedef uint16_t bsp_interrupt_handler_index_type;
+  #else
+    typedef uint32_t bsp_interrupt_handler_index_type;
+  #endif
   extern bsp_interrupt_handler_index_type bsp_interrupt_handler_index_table [];
 #endif
@@ -103 +110 @@
  * @ref BSP_INTERRUPT_USE_INDEX_TABLE.  With an enabled index table the handler
  * table will be accessed via a small index table.  You can define the size of
- * the handler table with @ref BSP_INTERRUPT_HANDLER_TABLE_SIZE.  You must
- * provide a data type for the index table
- * (@ref bsp_interrupt_handler_index_type).  It must be an integer type big
- * enough to index the complete handler table.
+ * the handler table with @ref BSP_INTERRUPT_HANDLER_TABLE_SIZE.
  *
  * Normally new list entries are allocated from the heap.  You may define

c/src/lib/libbsp/shared/include/utility.h

@@ -8 +8 @@
 
 /*
- * Copyright (c) 2008, 2010
- * embedded brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * <rtems@embedded-brains.de>
+ * Copyright (c) 2008-2011 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Obere Lagerstr. 30
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@embedded-brains.de>
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
  */
 
@@ -26 +29 @@
 
 #define BSP_BIT8(bit) \
-  ((uint8_t) (((uint8_t) 1) << (bit)))
+  ((uint8_t) (((unsigned int) 1) << (bit)))
 
 #define BSP_MSK8(first_bit, last_bit) \
@@ -32 +35 @@
 
 #define BSP_FLD8(val, first_bit, last_bit) \
-  ((uint8_t) (((val) << (first_bit)) & BSP_MSK8(first_bit, last_bit)))
+  ((uint8_t) \
+    ((((unsigned int) (val)) << (first_bit)) & BSP_MSK8(first_bit, last_bit)))
 
 #define BSP_FLD8GET(reg, first_bit, last_bit) \
@@ -42 +46 @@
 
 #define BSP_BIT16(bit) \
-  ((uint16_t) (((uint16_t) 1) << (bit)))
+  ((uint16_t) (((unsigned int) 1) << (bit)))
 
 #define BSP_MSK16(first_bit, last_bit) \
@@ -48 +52 @@
 
 #define BSP_FLD16(val, first_bit, last_bit) \
-  ((uint16_t) (((val) << (first_bit)) & BSP_MSK16(first_bit, last_bit)))
+  ((uint16_t) \
+    ((((unsigned int) (val)) << (first_bit)) & BSP_MSK16(first_bit, last_bit)))
 
 #define BSP_FLD16GET(reg, first_bit, last_bit) \
@@ -64 +69 @@
 
 #define BSP_FLD32(val, first_bit, last_bit) \
-  ((uint32_t) (((val) << (first_bit)) & BSP_MSK32(first_bit, last_bit)))
+  ((uint32_t) \
+    ((((uint32_t) (val)) << (first_bit)) & BSP_MSK32(first_bit, last_bit)))
 
 #define BSP_FLD32GET(reg, first_bit, last_bit) \
@@ -80 +86 @@
 
 #define BSP_FLD64(val, first_bit, last_bit) \
-  ((uint64_t) (((val) << (first_bit)) & BSP_MSK64(first_bit, last_bit)))
+  ((uint64_t) \
+    ((((uint64_t) (val)) << (first_bit)) & BSP_MSK64(first_bit, last_bit)))
 
 #define BSP_FLD64GET(reg, first_bit, last_bit) \