Changeset 4a4c7900 in rtems

Timestamp:

08/13/06 15:58:46 (17 years ago)

Author:

Thomas Doerfler <Thomas.Doerfler@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

ea3839aa

Parents:

7db4805e

Message:

added vectors.h to bsp.h
fixed bug in mscan

Location:

c/src/lib/libbsp/powerpc/gen5200

Files:

• include/bsp.h (modified) (1 diff)
• mscan/mscan.c (modified) (6 diffs)
• mscan/mscan.h (modified) (2 diffs)

c/src/lib/libbsp/powerpc/gen5200/include/bsp.h

@@ -107 +107 @@
 #include <rtems/clockdrv.h>
 #include <i2cdrv.h>
+#include <bsp/irq.h>
+#include <bsp/vectors.h>
 
 #if defined(HAS_UBOOT)

c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c

@@ -24 +24 @@
 #include <rtems/libio.h>
 #include <string.h>
-#include <bsp.h>
+#include "../include/bsp.h"
 #include "../irq/irq.h"
 #include "../include/mpc5200.h"
@@ -34 +34 @@
 
 struct mpc5200_rx_cntrl mpc5200_mscan_rx_cntrl[MPC5200_CAN_NO];
-volatile static struct mscan_channel_info chan_info[MPC5200_CAN_NO];
+static struct mscan_channel_info chan_info[MPC5200_CAN_NO];
 
 /* time segmant table  */
@@ -64 +64 @@
  * MPC5x00 MSCAN tx ring buffer function to get a can message buffer from the head of the tx ring buffer
  */
-volatile static struct can_message * get_tx_buffer(struct mscan_channel_info *chan)
+static struct can_message * get_tx_buffer(struct mscan_channel_info *chan)
   {
   /* define a temp. mess ptr. */
-  volatile struct can_message * tmp_mess_ptr = NULL, *temp_head_ptr;
+  struct can_message * tmp_mess_ptr = NULL, *temp_head_ptr;
 
   /* set temp. head pointer */
@@ -102 +102 @@
  * MPC5x00 MSCAN tx ring buffer function to write a can message buffer to the tail of the tx ring buffer
  */
-volatile static struct can_message * fill_tx_buffer(struct mscan_channel_info *chan, struct can_message * mess_ptr)
+static struct can_message * fill_tx_buffer(struct mscan_channel_info *chan, struct can_message * mess_ptr)
   {
   /* define a temp. mess ptr. to the entry which follows the current tail entry */
@@ -721 +721 @@
 
 /* local variables */
-uint8_t tq_no_min_dev = 0;
-uint32_t frq_tq, frq_dev, frq_dev_min = 0xFFFFFFFF;
+uint8_t presc_val, tq_no_dev_min = 0;
+uint32_t bit_rate, bit_rate_dev, frq_tq, bit_rate_dev_min = 0xFFFFFFFF;
 
 /* loop through all values of time quantas */
@@ -730 +730 @@
   frq_tq = *tq_no * can_bit_rate;
 
-  /* calculate the deviation from requested tq freq. */
-  frq_dev = can_clock_frq%frq_tq;
+  /* calculate the optimized prescal. val. */
+  presc_val = (can_clock_frq+frq_tq/2)/frq_tq;
+
+  /* calculate the bitrate */
+  bit_rate = can_clock_frq/(*tq_no * presc_val);
+
+  /* calculate the bitrate deviation */
+  if(can_bit_rate >= bit_rate)
+    {
+    /* calculate the bitrate deviation */
+    bit_rate_dev = can_bit_rate - bit_rate;
+    }
+  else
+    {
+    /* calculate the bitrate deviation */
+    bit_rate_dev = bit_rate - can_bit_rate;
+    }
 
   /* check the deviation freq. */
-  if(frq_dev == 0) {
+  if(bit_rate_dev == 0) {
 
     /* return if best match (zero deviation) */
-   return (uint8_t)(can_clock_frq/frq_tq);
+   return (uint8_t)(presc_val);
     }
   else
     {
 
-    /* check for minimum of freq. deviation */
-    if(frq_dev < frq_dev_min) {
+    /* check for minimum of bit rate deviation */
+    if(bit_rate_dev < bit_rate_dev_min) {
 
       /* recognize the minimum freq. deviation */
-      frq_dev_min = frq_dev;
+      bit_rate_dev_min = bit_rate_dev;
 
       /* recognize the no. of time quantas */
-      tq_no_min_dev = *tq_no;
+      tq_no_dev_min = *tq_no;
           }
         }
   }
 
-/* return the optimized prescaler value */
- *tq_no = tq_no_min_dev;
- return (uint8_t)(can_clock_frq/(tq_no_min_dev * can_bit_rate));
+  /* get the no of tq's */
+  *tq_no = tq_no_dev_min;
+
+  /* calculate time quanta freq. */
+  frq_tq = *tq_no * can_bit_rate;
+
+  /* return the optimized prescaler value */
+  return (uint8_t)((can_clock_frq+frq_tq/2)/frq_tq);
 }
 

c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.h

@@ -257 +257 @@
   };
 
-volatile struct ring_buf
+struct ring_buf
     {
-    volatile struct can_message *buf_ptr;
-    volatile struct can_message *head_ptr;
-    volatile struct can_message *tail_ptr;
+    struct can_message * volatile buf_ptr;
+    struct can_message * volatile head_ptr;
+    struct can_message * volatile tail_ptr;
     };
 
@@ -280 +280 @@
   uint8_t    mode;
   uint8_t    tx_buf_no;
-  volatile struct ring_buf tx_ring_buf;
+  struct ring_buf tx_ring_buf;
   };