[Commit-gnuradio] r6536 - gnuradio/branches/developers/matt/u2f/firmware

[eb]

Author: eb
Date: 2007-09-25 15:54:19 -0600 (Tue, 25 Sep 2007)
New Revision: 6536

Added:
   gnuradio/branches/developers/matt/u2f/firmware/eth_driver.c
   gnuradio/branches/developers/matt/u2f/firmware/eth_driver.h
Modified:
   gnuradio/branches/developers/matt/u2f/firmware/
   gnuradio/branches/developers/matt/u2f/firmware/Makefile
   gnuradio/branches/developers/matt/u2f/firmware/eth_mac.c
   gnuradio/branches/developers/matt/u2f/firmware/eth_mac.h
Log:
work-in-progress on ethernet driver


Property changes on: gnuradio/branches/developers/matt/u2f/firmware
___________________________________________________________________
Name: svn:ignore
   - *.dump
*.bin
*.rom
*.exe


   + *.dump
*.bin
*.rom
*.exe
*.a
*.o


Modified: gnuradio/branches/developers/matt/u2f/firmware/Makefile
===================================================================
--- gnuradio/branches/developers/matt/u2f/firmware/Makefile     2007-09-25 
20:06:46 UTC (rev 6535)
+++ gnuradio/branches/developers/matt/u2f/firmware/Makefile     2007-09-25 
21:54:19 UTC (rev 6536)
@@ -1,5 +1,7 @@
 CC = mb-gcc
 LD = mb-ld
+AR = mb-ar
+
 # CFLAGS = -Wall -O2 -g -mxl-gp-opt -mxl-soft-div -mxl-soft-mul -msoft-float
 CFLAGS = -Wall -O2 -g  -mxl-soft-div -mxl-soft-mul -msoft-float
 LINKER_SCRIPT = microblaze.ld
@@ -18,20 +20,33 @@
 
 ROMS = test1.rom eth_test.rom timer_test.rom
 DUMPS = test1.dump eth_test.dump timer_test.dump
+LIBS = libu2fw.a
 
 all: $(ROMS) $(DUMPS)
 
-test1.exe: test1_main.o u2_init.o spi.o buffer_pool.o sim_io.o
+LIBU2FWOBJS =          \
+       buffer_pool.o   \
+       eth_driver.o    \
+       eth_mac.o       \
+       sim_io.o        \
+       spi.o           \
+       u2_init.o       
+
+libu2fw.a : $(LIBU2FWOBJS)
+       rm -f $@
+       $(AR) crs $@ $(LIBU2FWOBJS)
+
+test1.exe: test1_main.o libu2fw.a
        $(CC) $(LDFLAGS) $^ -o $@
 
-eth_test.exe:  eth_test.o u2_init.o spi.o buffer_pool.o sim_io.o eth_mac.o
+eth_test.exe:  eth_test.o libu2fw.a
        $(CC) $(LDFLAGS) $^ -o $@
 
-timer_test.exe:  timer_test.o u2_init.o spi.o sim_io.o
+timer_test.exe:  timer_test.o libu2fw.a
        $(CC) $(LDFLAGS) $^ -o $@
 
 clean:
-       rm -f *.o *.bin *.rom *.exe *.dump
+       rm -f *.a *.o *.bin *.rom *.exe *.dump
 
 
 # dependencies

Added: gnuradio/branches/developers/matt/u2f/firmware/eth_driver.c
===================================================================
--- gnuradio/branches/developers/matt/u2f/firmware/eth_driver.c                 
        (rev 0)
+++ gnuradio/branches/developers/matt/u2f/firmware/eth_driver.c 2007-09-25 
21:54:19 UTC (rev 6536)
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio 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 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "eth_driver.h"
+#include "memory_map.h"
+#include "eth_phy.h"
+#include "eth_mac.h"
+
+void
+eth_driver_init(void)
+{
+}
+


Property changes on: gnuradio/branches/developers/matt/u2f/firmware/eth_driver.c
___________________________________________________________________
Name: svn:eol-style
   + native

Added: gnuradio/branches/developers/matt/u2f/firmware/eth_driver.h
===================================================================
--- gnuradio/branches/developers/matt/u2f/firmware/eth_driver.h                 
        (rev 0)
+++ gnuradio/branches/developers/matt/u2f/firmware/eth_driver.h 2007-09-25 
21:54:19 UTC (rev 6536)
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio 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 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INCLUDED_ETH_DRIVER_H
+#define INCLUDED_ETH_DRIVER_H
+
+void eth_driver_init(void);
+
+typedef enum { LS_UNKNOWN, LS_DOWN, LS_UP } eth_link_state_t;
+typedef enum { S_10, S_100, S_1000 } eth_speed_t;
+
+typedef struct {
+  eth_link_state_t     link_state;
+  eth_speed_t          current_speed;
+} eth_driver_t;
+
+#endif /* INCLUDED_ETH_DRIVER_H */


Property changes on: gnuradio/branches/developers/matt/u2f/firmware/eth_driver.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: gnuradio/branches/developers/matt/u2f/firmware/eth_mac.c
===================================================================
--- gnuradio/branches/developers/matt/u2f/firmware/eth_mac.c    2007-09-25 
20:06:46 UTC (rev 6535)
+++ gnuradio/branches/developers/matt/u2f/firmware/eth_mac.c    2007-09-25 
21:54:19 UTC (rev 6536)
@@ -23,7 +23,7 @@
 #include "memory_map.h"
 
 void 
-eth_mac_init()
+eth_mac_init(void)
 {
   // FIXME more to do
 
@@ -71,7 +71,7 @@
 }
 
 int
-eth_mac_miim_read_status()
+eth_mac_miim_read_status(void)
 {
   return eth_mac->miistatus;
 }

Modified: gnuradio/branches/developers/matt/u2f/firmware/eth_mac.h
===================================================================
--- gnuradio/branches/developers/matt/u2f/firmware/eth_mac.h    2007-09-25 
20:06:46 UTC (rev 6535)
+++ gnuradio/branches/developers/matt/u2f/firmware/eth_mac.h    2007-09-25 
21:54:19 UTC (rev 6536)
@@ -22,11 +22,11 @@
 #ifndef INCLUDED_ETH_MAC_H
 #define INCLUDED_ETH_MAC_H
 
-void eth_mac_init();
+void eth_mac_init(void);
 int  eth_mac_read_rmon(int addr);
 int  eth_mac_miim_read(int addr);
 void eth_mac_miim_write(int addr, int value);
-int  eth_mac_miim_read_status();
+int  eth_mac_miim_read_status(void);
 
 
 #endif /* INCLUDED_ETH_MAC_H */