wdenk 19 роки тому
батько
коміт
59acc296d9
4 змінених файлів з 8 додано та 7 видалено
  1. 2 2
      cpu/at91rm9200/i2c.c
  2. 1 1
      include/configs/cmc_pu2.h
  3. 5 3
      net/net.c
  4. 0 1
      rtc/rs5c372.c

+ 2 - 2
cpu/at91rm9200/i2c.c

@@ -118,8 +118,8 @@ i2c_probe(unsigned char chip)
 }
 
 int
-i2c_read(unsigned char chip, unsigned int addr, int alen,
-							unsigned char *buffer, int len)
+i2c_read (unsigned char chip, unsigned int addr, int alen,
+	  unsigned char *buffer, int len)
 {
 #ifdef CFG_I2C_EEPROM_ADDR_OVERFLOW
 	/* we only allow one address byte */

+ 1 - 1
include/configs/cmc_pu2.h

@@ -204,7 +204,7 @@ struct bd_info_ext {
 
 #define CFG_HZ 1000
 #define CFG_HZ_CLOCK AT91C_MASTER_CLOCK/2	/* AT91C_TC0_CMR is implicitly set to */
-					/* AT91C_TC_TIMER_DIV1_CLOCK */
+						/* AT91C_TC_TIMER_DIV1_CLOCK */
 
 #define CONFIG_STACKSIZE	(32*1024)	/* regular stack */
 

+ 5 - 3
net/net.c

@@ -468,7 +468,7 @@ restart:
 
 	/*
 	 *	Main packet reception loop.  Loop receiving packets until
-	 *	someone sets `NetQuit'.
+	 *	someone sets `NetState' to a state that terminates.
 	 */
 	for (;;) {
 		WATCHDOG_RESET();
@@ -503,7 +503,9 @@ restart:
 			thand_f *x;
 
 #if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
-#if defined(CFG_FAULT_ECHO_LINK_DOWN) && defined(CONFIG_STATUS_LED) && defined(STATUS_LED_RED)
+#  if defined(CFG_FAULT_ECHO_LINK_DOWN) &&
+      defined(CONFIG_STATUS_LED) &&
+      defined(STATUS_LED_RED)
 			/*
 			 * Echo the inverted link state to the fault LED.
 			 */
@@ -512,7 +514,7 @@ restart:
 			} else {
 				status_led_set (STATUS_LED_RED, STATUS_LED_ON);
 			}
-#endif /* CFG_FAULT_ECHO_LINK_DOWN, ... */
+#  endif /* CFG_FAULT_ECHO_LINK_DOWN, ... */
 #endif /* CONFIG_MII, ... */
 			x = timeHandler;
 			timeHandler = (thand_f *)0;

+ 0 - 1
rtc/rs5c372.c

@@ -95,7 +95,6 @@ rs5c372_enable(void)
 	unsigned char buf[RS5C372_RAM_SIZE + 1];
 	int ret;
 
-
 	/* note that this returns reg. 15 in buf[1] */
 	ret = rs5c372_readram(&buf[1], RS5C372_RAM_SIZE);
 	if (ret != 0) {