Changeset 0743eae in rtems

Timestamp:

Oct 11, 2007, 12:56:09 PM (14 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.9, 5, master

Children:

053c2f4

Parents:

8a781ad7

Message:

2007-10-11 Daniel Hellstrom <daniel@…>

• Makefile.am, shared/can/occan.c, shared/include/ambapp.h: Add initial i2c and update OC-CAN support.
• shared/i2c/i2cmst.c, shared/include/i2cmst.h: New files.

Location:

c/src/lib/libbsp/sparc

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• shared/can/occan.c (modified) (5 diffs)
• shared/i2c/i2cmst.c (added)
• shared/include/ambapp.h (modified) (1 diff)
• shared/include/i2cmst.h (added)

c/src/lib/libbsp/sparc/ChangeLog

@@ +1 @@
+2007-10-11      Daniel Hellstrom <daniel@gaisler.com>
+
+        * Makefile.am, shared/can/occan.c, shared/include/ambapp.h: Add initial
+        i2c and update OC-CAN support.
+        * shared/i2c/i2cmst.c, shared/include/i2cmst.h: New files.
+
 2007-09-21      Daniel Hellstrom <daniel@gaisler.com>
 

c/src/lib/libbsp/sparc/Makefile.am

@@ -60 +60 @@
 EXTRA_DIST += shared/include/b1553brm_rasta.h
 
+# I2C-master (I2CMST)
+EXTRA_DIST += shared/i2c/i2cmst.c
+EXTRA_DIST += shared/include/i2cmst.h
+
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am

c/src/lib/libbsp/sparc/shared/can/occan.c

@@ -199 +199 @@
 #endif
 
-#define MAX_TSEG1 7
-#define MAX_TSEG2 15
+#define MAX_TSEG2 7
+#define MAX_TSEG1 15
 
 #if 0
@@ -729 +729 @@
 #endif
 
-/* This function calculates BTR0 BTR1 values for a given bitrate.
- * Heavily based on mgt_mscan_bitrate() from peak driver, which 
- * in turn is based on work by Arnaud Westenberg.
+/* This function calculates BTR0 and BTR1 values for a given bitrate.
  *
  * Set communication parameters.
- * baud rate in Hz
- * input clock frequency of can core in Hz (system frequency)
- * sjw synchronization jump width (0-3) prescaled clock cycles
- * sampl_pt sample point in % (0-100) sets (TSEG1+2)/(TSEG1+TSEG2+3)
- *                                                               ratio
+ * \param clock_hz OC_CAN Core frequency in Hz.
+ * \param rate Requested baud rate in bits/second.
+ * \param result Pointer to where resulting BTRs will be stored.
+ * \return zero if successful to calculate a baud rate.
  */
 static int occan_calc_speedregs(unsigned int clock_hz, unsigned int rate, occan_speed_regs *result){
@@ -749 +746 @@
         int sampl_pt = 90;
 
-        if ( (rate<10000) || (rate>1000000) ){
+        if ( (rate<5000) || (rate>1000000) ){
                 /* invalid speed mode */
                 return -1;
@@ -817 +814 @@
                 tseg2 = best_tseg - tseg1 - 2;
         }
-/*
-        result->sjw = sjw;
-        result->brp = best_brp;
-        result->tseg1 = tseg1;
-        result->tseg2 = tseg2;
-*/
+
         result->btr0 = (sjw<<OCCAN_BUSTIM_SJW_BIT) | (best_brp&OCCAN_BUSTIM_BRP);
         result->btr1 = (0<<7) | (tseg2<<OCCAN_BUSTIM_TSEG2_BIT) | tseg1;
@@ -835 +827 @@
         priv->regs->bustim0 = timing->btr0;
         priv->regs->bustim1 = timing->btr1;
-        /*
-        priv->regs->bustim0 = (timing->sjw<<OCCAN_BUSTIM_SJW_BIT) | (timing->brp&OCCAN_BUSTIM_BRP);
-        priv->regs->bustim1 = (timing->sam<<7) | (timing->tseg2<<OCCAN_BUSTIM_TSEG2_BIT) | timing->tseg1;
-        */
         return 0;
 }

c/src/lib/libbsp/sparc/shared/include/ambapp.h

@@ -59 +59 @@
 #define GAISLER_SPACEWIRE 0x1f
 #define GAISLER_AHB2AHB   0x20
+#define GAISLER_I2CMST    0x28
+#define GAISLER_GRSPW2    0x29
 #define GAISLER_GRHCAN    0x34
 #define GAISLER_GRFIFO    0x35