[aadk-commits] dbailey: uClinux/trunk r164 - /uClinux/trunk/uClinux-dist/user/s800i/

aadk-commits at lists.digium.com aadk-commits at lists.digium.com
Thu Feb 22 15:08:36 MST 2007


Author: dbailey
Date: Thu Feb 22 16:08:35 2007
New Revision: 164

URL: http://svn.digium.com/view/aadk?view=rev&rev=164
Log:
Add user space utilities specifically geared for the s800i hardware. 

Added:
    uClinux/trunk/uClinux-dist/user/s800i/
    uClinux/trunk/uClinux-dist/user/s800i/Makefile   (with props)
    uClinux/trunk/uClinux-dist/user/s800i/crc32.c   (with props)
    uClinux/trunk/uClinux-dist/user/s800i/crc32.h   (with props)
    uClinux/trunk/uClinux-dist/user/s800i/dig_i2c_eeprom.h   (with props)
    uClinux/trunk/uClinux-dist/user/s800i/gettemp.c   (with props)
    uClinux/trunk/uClinux-dist/user/s800i/i2c-dev.h   (with props)
    uClinux/trunk/uClinux-dist/user/s800i/s800iconfig.c   (with props)

Added: uClinux/trunk/uClinux-dist/user/s800i/Makefile
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/s800i/Makefile?view=auto&rev=164
==============================================================================
--- uClinux/trunk/uClinux-dist/user/s800i/Makefile (added)
+++ uClinux/trunk/uClinux-dist/user/s800i/Makefile Thu Feb 22 16:08:35 2007
@@ -1,0 +1,23 @@
+CFG_EXEC = s800iconfig 
+CFG_OBJS = s800iconfig.o crc32.o 
+TEMP_EXEC = gettemp 
+TEMP_OBJS = gettemp.o 
+
+all: $(CFG_EXEC) $(TEMP_EXEC)
+
+$(CFG_EXEC):$(CFG_OBJS)
+		$(CC) $(LDFLAGS) -o $@ $(CFG_OBJS) $(LDLIBS$(LDLIBS_$@))
+
+$(TEMP_EXEC):$(TEMP_OBJS)
+		$(CC) $(LDFLAGS) -o $@ $(TEMP_OBJS) $(LDLIBS$(LDLIBS_$@))
+
+
+		
+romfs:
+		$(ROMFSINST) /bin/$(CFG_EXEC)
+		$(ROMFSINST) /bin/$(TEMP_EXEC)
+
+clean:
+		-rm -f $(EXEC) *.elf *.gdb *.o
+
+

Propchange: uClinux/trunk/uClinux-dist/user/s800i/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: uClinux/trunk/uClinux-dist/user/s800i/Makefile
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: uClinux/trunk/uClinux-dist/user/s800i/crc32.c
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/s800i/crc32.c?view=auto&rev=164
==============================================================================
--- uClinux/trunk/uClinux-dist/user/s800i/crc32.c (added)
+++ uClinux/trunk/uClinux-dist/user/s800i/crc32.c Thu Feb 22 16:08:35 2007
@@ -1,0 +1,197 @@
+/*
+ * This file is derived from crc32.c from the zlib-1.1.3 distribution
+ * by Jean-loup Gailly and Mark Adler.
+ */
+
+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#ifndef USE_HOSTCC	/* Shut down "ANSI does not permit..." warnings */
+//#include <common.h>	/* to get command definitions like CFG_CMD_JFFS2 */
+#endif
+
+#include "zlib.h"
+
+#define local static
+#define ZEXPORT	/* empty */
+unsigned long crc32 (unsigned long, const unsigned char *, unsigned int);
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local int crc_table_empty = 1;
+local uLongf crc_table[256];
+local void make_crc_table OF((void));
+
+/*
+  Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit.  Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one.  If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder.  The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+  x (which is shifting right by one and adding x^32 mod p if the bit shifted
+  out is a one).  We start with the highest power (least significant bit) of
+  q and repeat for all eight bits of q.
+
+  The table is simply the CRC of all possible eight bit values.  This is all
+  the information needed to generate CRC's on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.
+*/
+local void make_crc_table()
+{
+  uLong c;
+  int n, k;
+  uLong poly;            /* polynomial exclusive-or pattern */
+  /* terms of polynomial defining this crc (except x^32): */
+  static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+  /* make exclusive-or pattern from polynomial (0xedb88320L) */
+  poly = 0L;
+  for (n = 0; n < sizeof(p)/sizeof(Byte); n++)
+    poly |= 1L << (31 - p[n]);
+
+  for (n = 0; n < 256; n++)
+  {
+    c = (uLong)n;
+    for (k = 0; k < 8; k++)
+      c = c & 1 ? poly ^ (c >> 1) : c >> 1;
+    crc_table[n] = c;
+  }
+  crc_table_empty = 0;
+}
+#else
+/* ========================================================================
+ * Table of CRC-32's of all single-byte values (made by make_crc_table)
+ */
+local const uLongf crc_table[256] = {
+  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+  0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+  0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+  0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+  0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+  0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+  0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+  0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+  0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+  0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+  0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+  0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+  0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+  0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+  0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+  0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+  0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+  0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+  0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+  0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+  0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+  0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+  0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+  0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+  0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+  0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+  0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+  0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+  0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+  0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+  0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+  0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+  0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+  0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+  0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+  0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+  0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+  0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+  0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+  0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+  0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+  0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+  0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+  0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+  0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+  0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+  0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+  0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+  0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+  0x2d02ef8dL
+};
+#endif
+
+#if 0
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+const uLongf * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+  if (crc_table_empty) make_crc_table();
+#endif
+  return (const uLongf *)crc_table;
+}
+#endif
+
+/* ========================================================================= */
+#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
+#define DO2(buf)  DO1(buf); DO1(buf);
+#define DO4(buf)  DO2(buf); DO2(buf);
+#define DO8(buf)  DO4(buf); DO4(buf);
+
+/* ========================================================================= */
+uLong ZEXPORT crc32(crc, buf, len)
+    uLong crc;
+    const Bytef *buf;
+    uInt len;
+{
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+      make_crc_table();
+#endif
+    crc = crc ^ 0xffffffffL;
+    while (len >= 8)
+    {
+      DO8(buf);
+      len -= 8;
+    }
+    if (len) do {
+      DO1(buf);
+    } while (--len);
+    return crc ^ 0xffffffffL;
+}
+
+#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)
+
+/* No ones complement version. JFFS2 (and other things ?)
+ * don't use ones compliment in their CRC calculations.
+ */
+uLong ZEXPORT crc32_no_comp(uLong crc, const Bytef *buf, uInt len)
+{
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+      make_crc_table();
+#endif
+    while (len >= 8)
+    {
+      DO8(buf);
+      len -= 8;
+    }
+    if (len) do {
+      DO1(buf);
+    } while (--len);
+
+    return crc;
+}
+
+#endif	/* CFG_CMD_JFFS2 */

Propchange: uClinux/trunk/uClinux-dist/user/s800i/crc32.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: uClinux/trunk/uClinux-dist/user/s800i/crc32.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: uClinux/trunk/uClinux-dist/user/s800i/crc32.h
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/s800i/crc32.h?view=auto&rev=164
==============================================================================
--- uClinux/trunk/uClinux-dist/user/s800i/crc32.h (added)
+++ uClinux/trunk/uClinux-dist/user/s800i/crc32.h Thu Feb 22 16:08:35 2007
@@ -1,0 +1,21 @@
+#ifndef CRC32_H
+#define CRC32_H
+
+/* $Id: crc32.h,v 1.3 2005/09/01 09:09:30 aubrey Exp $ */
+
+#include <stdint.h>
+
+extern const uint32_t crc32_table[256];
+
+/* Return a 32-bit CRC of the contents of the buffer. */
+
+static inline uint32_t 
+crc32(uint32_t val, const void *ss, int len)
+{
+	const unsigned char *s = ss;
+        while (--len >= 0)
+                val = crc32_table[(val ^ *s++) & 0xff] ^ (val >> 8);
+        return val;
+}
+
+#endif

Propchange: uClinux/trunk/uClinux-dist/user/s800i/crc32.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: uClinux/trunk/uClinux-dist/user/s800i/crc32.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: uClinux/trunk/uClinux-dist/user/s800i/dig_i2c_eeprom.h
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/s800i/dig_i2c_eeprom.h?view=auto&rev=164
==============================================================================
--- uClinux/trunk/uClinux-dist/user/s800i/dig_i2c_eeprom.h (added)
+++ uClinux/trunk/uClinux-dist/user/s800i/dig_i2c_eeprom.h Thu Feb 22 16:08:35 2007
@@ -1,0 +1,40 @@
+#ifndef _UBOOT_DIG_I2C_ESEPROM_H
+#define _UBOOT_DIG_I2C_ESEPROM_H
+
+#define I2C_PROM_ADDRESS	(0x50)
+#define I2C_PROM_SIZE	(128)
+
+#define CRC_LOC 	(I2C_PROM_SIZE-4)
+#define I2C_24C01_PAGE_SIZE (8)
+
+/* 
+ * Enumerate the fields stored in the I2C eeprom 
+ *   (DIGCMD_NULL used as an end of data marker)
+ */
+enum cmd_state {
+	DIGCMD_BOARD_REVISION = 0,
+	DIGCMD_MAC_ADDRESS,
+	DIGCMD_PRODUCT_SKU,
+	DIGCMD_MFG_DATE,
+	DIGCMD_MFG_VENDOR,
+	DIGCMD_CAPABILITY_CODE,
+	DIGCMD_CRC,
+	DIGCMD_NULL
+};
+	
+/*
+ * Structure indicating the type of data, the size of the data, 
+ * and where it is located in the memory block
+ */
+struct rom_location {
+		enum cmd_state  state;
+		int				offset;
+		int				size;
+};
+
+extern const struct rom_location eeprom_map[];
+
+/*** Prototype ***/
+int get_i2c_mac(unsigned char * mac); //DBDEBUG temporary
+
+#endif

Propchange: uClinux/trunk/uClinux-dist/user/s800i/dig_i2c_eeprom.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: uClinux/trunk/uClinux-dist/user/s800i/dig_i2c_eeprom.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: uClinux/trunk/uClinux-dist/user/s800i/gettemp.c
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/s800i/gettemp.c?view=auto&rev=164
==============================================================================
--- uClinux/trunk/uClinux-dist/user/s800i/gettemp.c (added)
+++ uClinux/trunk/uClinux-dist/user/s800i/gettemp.c Thu Feb 22 16:08:35 2007
@@ -1,0 +1,161 @@
+/*
+ * gettemp  - Reads the s800i Board temperature sensors
+ *
+ * Copyright (C) 2006, Digium, Inc.
+ *
+ * Doug Bailey <dbailey at digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. 
+ */
+
+#include <dirent.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <asm/page.h>
+#include <linux/version.h>
+#include <linux/watchdog.h>
+#include "i2c-dev.h"
+
+/* NOTE: This program cannot get access to 
+ * the sensors if the hwmon lm75 module is loaded 
+ */
+		
+/* I2C Addresses of temp sensors on the board */
+unsigned char 	temp_addr[] = {0x49, 0x4a, 0x0};
+int 			temp_in_farenheit = 0;
+		
+extern int errno;
+		
+#define BAD_TEMP					(-100)
+#define TEMP_CONVERT_FACTOR			(0.0625)  /* 1/16th of a degree per bit */
+
+/*** Local Prototypes ***/
+static void show_usage(void);
+static int i2c_gettemp(int device);
+
+		
+int main(int argc, char ** argv)
+{
+	int		opt;
+	int 	sensor;
+	int 	temp;
+	float	conv_temp;
+		
+	opterr = 0;
+	while ((opt = getopt(argc, argv, "?f")) > 0) {
+		switch (opt) {
+			case 'f':	/* Change display to farenheit */
+				temp_in_farenheit = 1; 
+				break;
+			default:
+				show_usage();
+				return -1;
+		}
+	}
+	
+	for(sensor = 0; 0 != temp_addr[sensor]; sensor++){
+		if(BAD_TEMP == (temp = i2c_gettemp(temp_addr[sensor]))) {
+			printf("Invalid temperature from sensor %d at address %d (0x%x)\n", 
+				   sensor+1,
+				   temp_addr[sensor],
+				   temp_addr[sensor]);
+		} else {
+			conv_temp = (float)(temp) * TEMP_CONVERT_FACTOR;
+			if(temp_in_farenheit) {
+				conv_temp = (9.0/5.0)*conv_temp + 32.0;
+			}
+			printf("Temp at sensor %d at address %d (0x%x) = %1.2f%s \n", 
+				   sensor+1,
+				   temp_addr[sensor],
+				   temp_addr[sensor],
+				   conv_temp, 
+				   temp_in_farenheit ? "F" : "C");
+		}
+	}
+	
+	return 0;
+}
+
+/* Display command line usage */
+static void show_usage(void)
+{
+	printf("gettemp - Returns temperature from I2C sensors\n");  
+	printf("Usage: \n");  
+	printf("proc_watch [-f] \n");  
+	printf("\t\t-f - output temp in farenheit.  (Defaults to Celsius)\n");  
+	printf("\t\t-? - See this usage.\n");
+	
+}
+
+/* 
+ *	Retrieve the temperature from an ADT 75 temp sensor
+ *
+ *	This function uses ioctl calls to communicate to the I2C devices
+ */
+static int i2c_gettemp(int device)
+{
+	int 	file;
+	int 	res;
+	int 	adapter_nr = 0; /* deafaulting to the first one on the board*/
+	char 	filename[20];
+	char   	msg_data[32];
+	struct 	i2c_msg msg = { device, 0, 0, msg_data };
+	struct 	i2c_rdwr_ioctl_data rdwr = { &msg, 1 };
+
+	/* Open the connection to the I2C bus adapter */
+	sprintf(filename,"/dev/i2c-%d",adapter_nr);
+	if ((file = open(filename,O_RDWR)) < 0) {
+		/* ERROR HANDLING; you can check errno to see what went wrong */
+		printf("Error in opening i2c Adapter: %d: %s\n", errno, strerror(errno));
+		return BAD_TEMP;	    
+	}
+
+	/* Set this handle to talk to the I2C device that we want */
+	if (ioctl(file,I2C_SLAVE,device) < 0) {
+		/* ERROR HANDLING; you can check errno to see what went wrong */
+		printf("Error in setting i2c device address: %d: %s\n", errno, strerror(errno));
+		close( file );
+		return BAD_TEMP;	    
+	}
+
+	/* Tell the sensor that we will be reading the temperature value register */
+	msg_data[0]	= 0;
+	msg.addr 	= device;
+	msg.len   	= 1;
+	msg.flags 	= 0;
+	if ( ioctl( file, I2C_RDWR, &rdwr ) < 0 ) {
+		fprintf(stderr, "Could not select the temperature sensor register\n");
+		close( file );
+	};
+
+	/* Read the actual temperature from the device */
+	msg.len   	= 2;
+	msg_data[0]	=0;
+	msg_data[1]	=0;
+	msg.flags 	= I2C_M_RD ;
+	if ( ioctl( file, I2C_RDWR, &rdwr ) < 0 ) {
+		fprintf(stderr, "Error: could not read back temperature value\n");
+		close( file );
+		return BAD_TEMP;	    
+	} 
+	
+	res = (msg_data[0] & 0x7f);
+	res <<= 4;
+	res += ((msg_data[1] & 0xf0)>>4);
+	if(msg_data[0] & 0x80) res = -res;
+	
+	close(file);
+	return res;
+}
+

Propchange: uClinux/trunk/uClinux-dist/user/s800i/gettemp.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: uClinux/trunk/uClinux-dist/user/s800i/gettemp.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: uClinux/trunk/uClinux-dist/user/s800i/i2c-dev.h
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/s800i/i2c-dev.h?view=auto&rev=164
==============================================================================
--- uClinux/trunk/uClinux-dist/user/s800i/i2c-dev.h (added)
+++ uClinux/trunk/uClinux-dist/user/s800i/i2c-dev.h Thu Feb 22 16:08:35 2007
@@ -1,0 +1,134 @@
+/*
+ *
+ *    Rev:          $Id: i2c-dev.h,v 1.1 2005/07/18 10:13:16 hennerich Exp $
+ *    Revision:     $Revision: 1.1 $
+ *    Source:       $Source: /usr/cvsroot/adi/uclinux533/uClinux-dist/user/blkfin-test/ppifcd-test/i2c-dev.h,v $  
+ *    Created:      06.07.2005 18:16
+ *    Author:       Michael Hennerich
+ *    mail:         hennerich at blackfin.uclinux.org
+ *    Description:  User Space friendly include files for /dev/I2C-x access 
+ *                  
+ *   Copyright (C) 2005 Michael Hennerich
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *
+ ****************************************************************************
+ * MODIFICATION HISTORY:
+ ***************************************************************************/ 
+/*
+    i2c-dev.h - i2c-bus driver, char device interface
+
+    Copyright (C) 1995-97 Simon G. Vogl
+    Copyright (C) 1998-99 Frodo Looijaard <frodol at dds.nl>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/* $Id: i2c-dev.h,v 1.1 2005/07/18 10:13:16 hennerich Exp $ */
+
+#ifndef _LINUX_I2C_DEV_H
+#define _LINUX_I2C_DEV_H
+
+
+
+/* Some IOCTL commands are defined in <linux/i2c.h> */
+/* Note: 10-bit addresses are NOT supported! */
+
+struct i2c_msg {
+    unsigned short addr;    /* slave address            */
+    unsigned short flags;       
+#define I2C_M_TEN   0x10    /* we have a ten bit chip address   */
+#define I2C_M_RD    0x01
+#define I2C_M_NOSTART   0x4000
+#define I2C_M_REV_DIR_ADDR  0x2000
+#define I2C_M_IGNORE_NAK    0x1000
+#define I2C_M_NO_RD_ACK     0x0800
+    unsigned short len;     /* msg length               */
+    unsigned char *buf;     /* pointer to msg data          */
+};
+
+/* This is the structure as used in the I2C_SMBUS ioctl call */
+
+
+
+struct i2c_smbus_ioctl_data {
+    unsigned char read_write;
+    unsigned char command;
+    unsigned int size;
+    union i2c_smbus_data  *data;
+};
+
+/* This is the structure as used in the I2C_RDWR ioctl call */
+struct i2c_rdwr_ioctl_data {
+    struct i2c_msg  *msgs;  /* pointers to i2c_msgs */
+    unsigned int nmsgs;         /* number of i2c_msgs */
+};
+
+
+#define  I2C_RDRW_IOCTL_MAX_MSGS    42
+
+/* ----- commands for the ioctl like i2c_command call:
+ * note that additional calls are defined in the algorithm and hw 
+ *  dependent layers - these can be listed here, or see the 
+ *  corresponding header files.
+ */
+/* -> bit-adapter specific ioctls   */
+#define I2C_RETRIES 0x0701  /* number of times a device address      */
+                            /* should be polled when not            */
+                            /* acknowledging            */
+#define I2C_TIMEOUT 0x0702  /* set timeout - call with int      */
+
+
+/* this is for i2c-dev.c    */
+#define I2C_SLAVE   0x0703  /* Change slave address         */
+                            /* Attn.: Slave address is 7 or 10 bits */
+#define I2C_SLAVE_FORCE 0x0706  /* Change slave address         */
+                            /* Attn.: Slave address is 7 or 10 bits */
+                            /* This changes the address, even if it */
+                            /* is already taken!            */
+#define I2C_TENBIT  0x0704  /* 0 for 7 bit addrs, != 0 for 10 bit   */
+
+#define I2C_FUNCS   0x0705  /* Get the adapter functionality */
+#define I2C_RDWR    0x0707  /* Combined R/W transfer (one stop only)*/
+#define I2C_PEC     0x0708  /* != 0 for SMBus PEC                   */
+
+#define I2C_ACK_TEST    0x0710  /* See if a slave is at a specific address */
+
+
+#define I2C_SMBUS   0x0720  /* SMBus-level access */
+
+/* ... algo-bit.c recognizes */
+#define I2C_UDELAY  0x0705  /* set delay in microsecs between each  */
+                            /* written byte (except address)    */
+#define I2C_MDELAY  0x0706  /* millisec delay between written bytes */
+
+/* ----- I2C-DEV: char device interface stuff ------------------------- */
+
+#define I2C_MAJOR   89      /* Device major number      */
+
+#endif /* _LINUX_I2C_DEV_H */

Propchange: uClinux/trunk/uClinux-dist/user/s800i/i2c-dev.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: uClinux/trunk/uClinux-dist/user/s800i/i2c-dev.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: uClinux/trunk/uClinux-dist/user/s800i/s800iconfig.c
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/s800i/s800iconfig.c?view=auto&rev=164
==============================================================================
--- uClinux/trunk/uClinux-dist/user/s800i/s800iconfig.c (added)
+++ uClinux/trunk/uClinux-dist/user/s800i/s800iconfig.c Thu Feb 22 16:08:35 2007
@@ -1,0 +1,228 @@
+/*
+ * s800iconfig  - Reads and formats the s800i configuration PROM contents
+ *
+ * Copyright (C) 2007, Digium, Inc.
+ *
+ * Doug Bailey <dbailey at digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. 
+ */
+
+#include <dirent.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <asm/page.h>
+#include <linux/version.h>
+#include "i2c-dev.h"
+#include "dig_i2c_eeprom.h"		
+
+		
+/* I2C Addresses of temp sensors on the board */
+unsigned char 	eeprom_addr = 0x50;
+		
+/* CRC32 calculation function required to verify the PROM contents */
+unsigned long crc32(unsigned long  crc, const unsigned char *buf,	unsigned int len);
+
+#define EEPROM_SIZE 	(I2C_PROM_SIZE)
+		
+extern int errno;
+		
+/* Map of where data is stored in the i2c eeprom */
+const struct rom_location eeprom_map[] = {
+	{ .state = DIGCMD_BOARD_REVISION, 	.offset = 0, .size = 16},
+	{ .state = DIGCMD_PRODUCT_SKU, 		.offset =16, .size = 16},
+	{ .state = DIGCMD_MAC_ADDRESS, 		.offset =32, .size = 6},
+	{ .state = DIGCMD_MFG_DATE, 		.offset =38, .size = 4},
+	{ .state = DIGCMD_MFG_VENDOR, 		.offset =42, .size = 4},
+	{ .state = DIGCMD_CAPABILITY_CODE, 	.offset =46, .size = 32},
+	{ .state = DIGCMD_CRC, 				.offset =CRC_LOC,.size = 4},
+	{ .state = DIGCMD_NULL, 			.offset =0,  .size = I2C_PROM_SIZE}
+};
+
+		
+/*** Local Prototypes ***/
+static void show_usage(void);
+static int i2c_readEEPROM(int device, unsigned char * buf, int start, int num);
+static void dump_buffer(unsigned char * buf, int len);
+static void print_contents(unsigned char *eeprom);
+		
+int main(int argc, char ** argv)
+{
+	int		opt;
+	unsigned char eeprom_image[EEPROM_SIZE];
+	int 	num_read;
+	unsigned long 	crc_calc; 
+	unsigned long 	crc_val; 
+	int 			dump_all = 0;				
+	
+	/* parse command line arguments */
+	opterr = 0;
+	while ((opt = getopt(argc, argv, "?d")) > 0) {
+		switch (opt) {
+			case 'd':	/* Dump the full contents read */
+				dump_all = 1;
+				break;
+			default:
+				show_usage();
+				return -1;
+		}
+	}
+	/* read the raw data from the PROM */
+	num_read = i2c_readEEPROM(eeprom_addr, eeprom_image, 0 , EEPROM_SIZE+1);
+	if(EEPROM_SIZE <= num_read){
+		/* compare calculated CRC with value stored at end of the image */
+		crc_val = *((unsigned long *)(&eeprom_image[CRC_LOC]));
+		crc_calc = crc32(0L, eeprom_image, CRC_LOC);
+		if(crc_val == crc_calc) {
+			print_contents(eeprom_image);
+		} else {
+			printf("Invalid CRC calculation\n");
+		}
+		/* If user wants raw info as well */
+		if(dump_all) {
+			printf("EEPROM Raw contents\n");
+			dump_buffer(eeprom_image, EEPROM_SIZE);
+			printf("Calculated CRC = %08x, Stored CRC = %08x\n", crc_calc, crc_val);
+		}
+	} else {
+		printf("s800iconfig: Cannot read eeprom contents\n");
+	}
+	return 0;
+}
+
+/* Display command line usage */
+static void show_usage(void)
+{
+	printf("s800iconfig - Prints out contents of I2C Configuration EEPROM\n");  
+	printf("Usage: s800iconfig [-d] [-?]\n");  
+	printf("\t -d = Dump the raw contents of the PROM as well formatted\n");  
+	printf("\t -? = Display this usage\n");  
+	return;
+}
+
+/*
+ *	Prints out the formatted data read from the eeprom 
+ *	
+ */
+void print_contents(unsigned char *eeprom)
+{
+	int base;
+	unsigned char *pmac;
+	
+	printf("S800i Product Configuration\n");
+	for(base = 0; eeprom_map[base].state != DIGCMD_NULL; base++){
+		switch(eeprom_map[base].state) {
+		case DIGCMD_BOARD_REVISION:
+			printf("Board Revision: %.*s\n", 	
+				   eeprom_map[base].size, &eeprom[eeprom_map[base].offset]);
+			break;
+		case DIGCMD_PRODUCT_SKU:
+			printf("Product SKU: %.*s\n", 		
+				   eeprom_map[base].size, &eeprom[eeprom_map[base].offset]);
+			break;
+		case DIGCMD_MAC_ADDRESS:
+			pmac = &eeprom[eeprom_map[base].offset];
+			printf("MAC/Serial: %02x:%02x:%02x:%02x:%02x:%02x\n", 
+				   pmac[0], pmac[1], pmac[2], pmac[3], pmac[4], pmac[5]);
+			break;
+		case DIGCMD_MFG_DATE:
+			printf("MFG Date: %.*s\n", 			
+				   eeprom_map[base].size, &eeprom[eeprom_map[base].offset]);
+			break;
+		case DIGCMD_MFG_VENDOR:
+			printf("MFG Code: %.*s\n", 			
+				   eeprom_map[base].size, &eeprom[eeprom_map[base].offset]);
+			break;
+		case DIGCMD_CAPABILITY_CODE:
+			printf("Capability: %.*s\n", 		
+				   eeprom_map[base].size, &eeprom[eeprom_map[base].offset]);
+			break;
+		}
+	}
+}
+
+/*
+ *	Reads the I2C eeprom device via IOCTL calls as defined in Documentation/i2c/dev-interfaces 
+ *	
+ */
+static int i2c_readEEPROM(int device, unsigned char * buf, int start, int num)
+{
+	int file;
+	int res;
+	int adapter_nr = 0; /* probably dynamically determined */
+	char filename[20];
+	char   msg_startaddr[4];
+	/* Message structures used to spec i2c transactions to the i2c driver */
+	struct i2c_msg msg[2] = {
+		{ 	.addr = device, 
+			.flags = 0,
+			.len = 1, 
+			.buf = msg_startaddr }, 
+		{ 	.addr = device, 
+			.flags = I2C_M_RD ,
+			.len = num+1, 
+			.buf = buf }};
+	struct i2c_rdwr_ioctl_data rdwr = { msg, 2 };
+
+	sprintf(filename,"/dev/i2c-%d",adapter_nr);
+	if ((file = open(filename,O_RDWR)) < 0) {
+		/* ERROR HANDLING; you can check errno to see what went wrong */
+		printf("Error in opening i2c Adapter: %d: %s\n", errno, strerror(errno));
+		return -1;	    
+	}
+
+	if (ioctl(file,I2C_SLAVE,device) < 0) {
+		/* ERROR HANDLING; you can check errno to see what went wrong */
+		printf("Error in setting i2c device address: %d: %s\n", errno, strerror(errno));
+		return -1;	    
+	}
+
+	msg_startaddr[0]		= start;	/* Spec the first address to read */
+	if ( ioctl( file, I2C_RDWR, &rdwr ) < 0 ) {
+		fprintf(stderr, "Error: could not read back data\n");
+		close( file );
+		return -1;	    
+	} 
+	
+	close(file);
+	return num;
+}
+
+/*
+ *	Dumps the contents of the given buffer in hex dump
+ *	format. 
+ */
+static void dump_buffer(unsigned char * buf, int len)
+{
+	int i;
+	int marker = 0;
+	
+	while(0 < len) {
+		printf("%04X: ", marker);
+		for(i = 0; i < len && i < 16; i++) {
+			printf("%02x ", *(buf+i));
+		}
+		for(; i < 16; i++) {
+			printf("  ", *(buf+i));
+		}
+		printf("   ");
+		for(i = 0; i < len && i < 16; i++) {
+			printf("%c", ' ' <= *(buf+i) ? *(buf+i) : '.' );
+		}
+		printf("\n");
+		len -= i;
+		buf += i;
+		marker += i;
+	}
+}

Propchange: uClinux/trunk/uClinux-dist/user/s800i/s800iconfig.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: uClinux/trunk/uClinux-dist/user/s800i/s800iconfig.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain



More information about the aadk-commits mailing list