From 26ed3732876a649fb02a83e768e4392034d65653 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 17 Oct 2009 10:33:37 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1229
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/io/platforms/AT91SAM7X/mac_lld.c | 4 ++++
 os/io/platforms/AT91SAM7X/mii_lld.c | 4 ++++
 os/kernel/include/mempools.h        | 6 +++++-
 os/kernel/src/chsys.c               | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'os')

diff --git a/os/io/platforms/AT91SAM7X/mac_lld.c b/os/io/platforms/AT91SAM7X/mac_lld.c
index 223d54342..85d2812e8 100644
--- a/os/io/platforms/AT91SAM7X/mac_lld.c
+++ b/os/io/platforms/AT91SAM7X/mac_lld.c
@@ -204,6 +204,7 @@ void mac_lld_init(void) {
  */
 void mac_lld_set_address(MACDriver *macp, const uint8_t *p) {
 
+  (void)macp;
   AT91C_BASE_EMAC->EMAC_SA1L = (AT91_REG)((p[3] << 24) | (p[2] << 16) |
                                           (p[1] << 8) | p[0]);
   AT91C_BASE_EMAC->EMAC_SA1H = (AT91_REG)((p[5] << 8) | p[4]);
@@ -224,6 +225,8 @@ msg_t max_lld_get_transmit_descriptor(MACDriver *macp,
                                       MACTransmitDescriptor *tdp) {
   EMACDescriptor *edp;
 
+  (void)macp;
+
   if (!link_up)
     return RDY_TIMEOUT;
 
@@ -318,6 +321,7 @@ msg_t max_lld_get_receive_descriptor(MACDriver *macp,
   unsigned n;
   EMACDescriptor *edp;
 
+  (void)macp;
   n = EMAC_RECEIVE_DESCRIPTORS;
 
   /*
diff --git a/os/io/platforms/AT91SAM7X/mii_lld.c b/os/io/platforms/AT91SAM7X/mii_lld.c
index 518190d4e..4d69adc43 100644
--- a/os/io/platforms/AT91SAM7X/mii_lld.c
+++ b/os/io/platforms/AT91SAM7X/mii_lld.c
@@ -42,6 +42,8 @@ void mii_lld_init(void) {
  */
 void mii_lld_reset(MACDriver *macp) {
 
+  (void)macp;
+
   /*
    * Disables the pullups on all the pins that are latched on reset by the PHY.
    * The status latched into the PHY is:
@@ -87,6 +89,7 @@ void mii_lld_reset(MACDriver *macp) {
  */
 phyreg_t mii_lld_get(MACDriver *macp, phyaddr_t addr) {
 
+  (void)macp;
   AT91C_BASE_EMAC->EMAC_MAN = (0b01 << 30) |            /* SOF */
                               (0b10 << 28) |            /* RW */
                               (PHY_ADDRESS << 23) |     /* PHYA */
@@ -106,6 +109,7 @@ phyreg_t mii_lld_get(MACDriver *macp, phyaddr_t addr) {
  */
 void mii_lld_put(MACDriver *macp, phyaddr_t addr, phyreg_t value) {
 
+  (void)macp;
   AT91C_BASE_EMAC->EMAC_MAN = (0b01 << 30) |            /* SOF */
                               (0b01 << 28) |            /* RW */
                               (PHY_ADDRESS << 23) |     /* PHYA */
diff --git a/os/kernel/include/mempools.h b/os/kernel/include/mempools.h
index d5e612426..a458b8e34 100644
--- a/os/kernel/include/mempools.h
+++ b/os/kernel/include/mempools.h
@@ -56,7 +56,11 @@ typedef struct {
  * @param name the name of the memory pool variable
  * @param size size of the memory pool contained objects
  */
-#define _MEMORYPOOL_DATA(name, size) {NULL, size}
+#if CH_USE_MEMCORE || defined(__DOXYGEN__)
+#define _MEMORYPOOL_DATA(name, size) {NULL, MEM_ALIGN_SIZE(size), FALSE}
+#else
+#define _MEMORYPOOL_DATA(name, size) {NULL, MEM_ALIGN_SIZE(size)}
+#endif
 
 /**
  * @brief Static memory pool initializer.
diff --git a/os/kernel/src/chsys.c b/os/kernel/src/chsys.c
index 7d42eb644..326699ea0 100644
--- a/os/kernel/src/chsys.c
+++ b/os/kernel/src/chsys.c
@@ -40,6 +40,7 @@ static WORKING_AREA(idle_thread_wa, IDLE_THREAD_STACK_SIZE);
  */
 static void idle_thread(void *p) {
 
+  (void)p;
   while (TRUE) {
     port_wait_for_interrupt();
     IDLE_LOOP_HOOK();
-- 
cgit v1.2.3