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

[eb]

Author: eb
Date: 2007-09-24 21:54:03 -0600 (Mon, 24 Sep 2007)
New Revision: 6529

Added:
   gnuradio/branches/developers/matt/u2f/firmware/eth_mac_regs.h
Modified:
   gnuradio/branches/developers/matt/u2f/firmware/Makefile
   gnuradio/branches/developers/matt/u2f/firmware/memory_map.h
Log:
added ethernet MAC register defs

Modified: gnuradio/branches/developers/matt/u2f/firmware/Makefile
===================================================================
--- gnuradio/branches/developers/matt/u2f/firmware/Makefile     2007-09-25 
01:46:41 UTC (rev 6528)
+++ gnuradio/branches/developers/matt/u2f/firmware/Makefile     2007-09-25 
03:54:03 UTC (rev 6529)
@@ -35,11 +35,10 @@
 
 
 # dependencies
-bootstrap.o: memory_map.h spi.h buffer_pool.h sim_io.h bootstrap.c
-spi.o: memory_map.h spi.h spi.c
+bootstrap.o: memory_map.h eth_mac_regs.h spi.h buffer_pool.h sim_io.h 
bootstrap.c
+spi.o: memory_map.h eth_mac_regs.h spi.h spi.c
 buffer_pool.o: memory_map.h buffer_pool.h buffer_pool.c
 sim_io.o: sim_io.h
-test1_main.o: u2_init.h memory_map.h spi.h buffer_pool.h sim_io.h test1_main.c
-eth_test.o: u2_init.h memory_map.h spi.h buffer_pool.h sim_io.h eth_test.c
-eth.o: u2_init.h memory_map.h spi.h buffer_pool.h sim_io.h eth.c
-
+test1_main.o: u2_init.h memory_map.h eth_mac_regs.h spi.h buffer_pool.h 
sim_io.h test1_main.c
+eth_test.o: u2_init.h memory_map.h eth_mac_regs.h spi.h buffer_pool.h sim_io.h 
eth_test.c
+eth.o: u2_init.h memory_map.h eth_mac_regs.h spi.h buffer_pool.h sim_io.h eth.c

Added: gnuradio/branches/developers/matt/u2f/firmware/eth_mac_regs.h
===================================================================
--- gnuradio/branches/developers/matt/u2f/firmware/eth_mac_regs.h               
                (rev 0)
+++ gnuradio/branches/developers/matt/u2f/firmware/eth_mac_regs.h       
2007-09-25 03:54:03 UTC (rev 6529)
@@ -0,0 +1,74 @@
+/* -*- 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_MAC_REGS_H
+#define INCLUDED_ETH_MAC_REGS_H
+
+/*
+ * In reality, these are 16-bit regs, but are assigned
+ * on 32-bit boundaries.  Because we're little endian,
+ * declaring them "int" works.
+ */
+typedef struct {
+  volatile int tx_hwmark;
+  volatile int tx_lwmark;
+  volatile int pause_frame_send_en;
+  volatile int pause_quanta_set;
+  volatile int ifg_set;
+  volatile int full_duplex;
+  volatile int max_retry;
+  volatile int mac_tx_add_en;
+  volatile int mac_tx_add_prom_data;
+  volatile int mac_tx_add_prom_add;
+  volatile int mac_tx_add_prom_wr;
+  volatile int tx_pause_en;
+  volatile int xoff_cpu;
+  volatile int xon_cpu;
+  volatile int mac_rx_add_chk_en;
+  volatile int mac_rx_add_prom_data;
+  volatile int mac_rx_add_prom_add;
+  volatile int mac_rx_add_prom_wr;
+  volatile int broadcast_filter_en;
+  volatile int broadcast_bucket_depth;
+  volatile int broadcast_bucket_interval;
+  volatile int rx_append_crc;
+  volatile int rx_hwmark;
+  volatile int rx_lwmark;
+  volatile int crc_chk_en;
+  volatile int rx_ifg_set;
+  volatile int rx_max_length;
+  volatile int rx_min_length;
+  volatile int cpu_rd_addr;            // performance counter access
+  volatile int cpu_rd_apply;           
+  volatile int cpu_rd_grant;           // READONLY
+  volatile int cpu_rd_dout_lo;         // READONLY
+  volatile int cpu_rd_dout_hi;         // READONLY
+  volatile int line_loop_en;
+  volatile int speed;
+  volatile int miimoder;
+  volatile int miicommand;
+  volatile int miiaddress;
+  volatile int miitx_data;
+  volatile int miirx_data;
+  volatile int miistatus;
+} eth_mac_regs_t;
+
+#endif /* INCLUDED_ETH_MAC_REGS_H */


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

Modified: gnuradio/branches/developers/matt/u2f/firmware/memory_map.h
===================================================================
--- gnuradio/branches/developers/matt/u2f/firmware/memory_map.h 2007-09-25 
01:46:41 UTC (rev 6528)
+++ gnuradio/branches/developers/matt/u2f/firmware/memory_map.h 2007-09-25 
03:54:03 UTC (rev 6529)
@@ -118,12 +118,16 @@
 #define gpio_base ((gpio_regs_t *) GPIO_BASE)
 
 ///////////////////////////////////////////////////
-// Master Controller, Slave 5
+// Buffer Pool status, Slave 5
 
 ///////////////////////////////////////////////////
 // Ethernet Core, Slave 6
 #define ETH_BASE 0xC000
 
+#include "eth_mac_regs.h"
+
+#define eth_mac ((eth_mac_regs_t *) ETH_BASE)
+
 ////////////////////////////////////////////////////
 // Settings Bus, Slave #7, Not Byte Addressable!
 #define SETTINGS_BASE 0xD000