Changeset 39dfbe16 in rtems

Timestamp:

Sep 9, 2008, 1:18:58 PM (11 years ago)

Author:

Thomas Doerfler <Thomas.Doerfler@…>

Branches:

4.10, 4.11, 4.9, master

Children:

85e87f1

Parents:

ae52c9c

Message:

minor additions
i2c-driver: wait, 'til stop executed

Location:

c/src/lib/libcpu/powerpc

Files:

• ChangeLog (modified) (2 diffs)
• mpc83xx/i2c/mpc83xx_i2cdrv.c (modified) (1 diff)
• mpc8xx/include/mpc8xx.h (modified) (1 diff)
• mpc8xx/timer/timer.c (modified) (1 diff)

c/src/lib/libcpu/powerpc/ChangeLog

@@ +1 @@
+2008-09-09      Thomas Doerfler <thomas.doerfler@embedded-brains.de>
+
+        * mpc8xx/mpc8xx.h, mpc8xx/timer/timer.c: minor additions
+
+        * mpc83xx/i2c/mpc83xx_i2cdrv.c: wait, 'til STOP has been executed
+
 2008-09-08      Joel Sherrill <joel.sherrill@oarcorp.com>
 
@@ -10 +16 @@
 
         * mpc8xx/cpm/cp.c: use correct type for interrupt level
-        
+
 2008-09-06      Ralf Corsépius <ralf.corsepius@rtems.org>
 

c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c

@@ -425 +425 @@
 #endif
   softc_ptr->reg_ptr->i2ccr &= ~MPC83XX_I2CCR_MSTA;
-
+  /*
+   * wait, 'til stop has been executed
+   */
+  while (0 != (softc_ptr->reg_ptr->i2csr & MPC83XX_I2CSR_MBB)) {
+    rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);
+  }
 #if defined(DEBUG)
   printk("... exit OK\r\n");

c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h

@@ -279 +279 @@
 #define M8xx_FEC_IMASK_EBERREN (1 << 22)
 
+  /*
+   * access macros to write to mii_data register
+   */
+#define M8xx_FEC_MII_DATA_ST       ( 1           << (31- 1))
+#define M8xx_FEC_MII_DATA_OP_RD    ( 2           << (31- 3))
+#define M8xx_FEC_MII_DATA_OP_WR    ( 1           << (31- 3))
+#define M8xx_FEC_MII_DATA_PHYAD(n) (((n) & 0x3f) << (31- 8))
+#define M8xx_FEC_MII_DATA_PHYRA(n) (((n) & 0x3f) << (31-13))
+#define M8xx_FEC_MII_DATA_TA       ( 2           << (31-15))
+#define M8xx_FEC_MII_DATA_WDATA(n) ((n) & 0xffff           )
+#define M8xx_FEC_MII_DATA_RDATA(reg) ((reg) & 0xffff       )
+  /*
+   * bits for FEC X_CNTRL register
+   */
+#define M8xx_FEC_X_CNTRL_FDEN       ( 1           << (31-29))
+#define M8xx_FEC_X_CNTRL_HBC        ( 1           << (31-30))
+#define M8xx_FEC_X_CNTRL_GTS        ( 1           << (31-31))
 /*
 *************************************************************************

c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c

@@ -83 +83 @@
   if ( benchmark_timer_find_average_overhead == 1 )
     return total;          /* in XXX microsecond units */
-
   else {
     if ( total < bsp_timer_least_valid ) {