grlib-gpl-1.0.22-b4075

bin/Makefile.config

@@ -1,105 +1,109 @@
-CONFDEP = $(GRLIB)/lib/techmap/gencomp/clkgen.in \
-$(GRLIB)/lib/techmap/gencomp/tech.in \
-$(GRLIB)/lib/techmap/clocks/clkgen.in \
-$(GRLIB)/lib/gaisler/leon3/leon3.in \
-$(GRLIB)/lib/gaisler/leon3/irqmp.in \
-$(GRLIB)/lib/gaisler/spacewire/spacewire.in \
-$(GRLIB)/lib/gaisler/jtag/jtag.in \
+CONFDEP = $(GRLIB)/lib/esa/memoryctrl/mctrl.in \
+$(GRLIB)/lib/esa/pci/pci_arb.in \
 $(GRLIB)/lib/gaisler/net/edcl.in \
-$(GRLIB)/lib/gaisler/usb/usbdcl.in \
-$(GRLIB)/lib/gaisler/usb/usb.in \
+$(GRLIB)/lib/gaisler/usb/grusb_dcl.in \
+$(GRLIB)/lib/gaisler/usb/grusbhc.in \
+$(GRLIB)/lib/gaisler/usb/grusbdc.in \
+$(GRLIB)/lib/gaisler/ata/ata.in \
+$(GRLIB)/lib/gaisler/uart/uart2.in \
+$(GRLIB)/lib/gaisler/uart/dcom.in \
+$(GRLIB)/lib/gaisler/uart/uart1.in \
+$(GRLIB)/lib/gaisler/spacewire/spacewire.in \
+$(GRLIB)/lib/gaisler/can/grcan.in \
+$(GRLIB)/lib/gaisler/can/can_oc.in \
+$(GRLIB)/lib/gaisler/can/can_mc.in \
+$(GRLIB)/lib/gaisler/leon3/irqmp.in \
+$(GRLIB)/lib/gaisler/leon3/leon3.in \
+$(GRLIB)/lib/gaisler/pci/pci_target.in \
+$(GRLIB)/lib/gaisler/pci/pci_mtf.in \
+$(GRLIB)/lib/gaisler/pci/pcitrace.in \
+$(GRLIB)/lib/gaisler/pci/pci.in \
+$(GRLIB)/lib/gaisler/pci/pcidma.in \
+$(GRLIB)/lib/gaisler/memctrl/spimctrl.in \
+$(GRLIB)/lib/gaisler/memctrl/ssrctrl.in \
+$(GRLIB)/lib/gaisler/memctrl/sdctrl.in \
+$(GRLIB)/lib/gaisler/memctrl/srctrl.in \
+$(GRLIB)/lib/gaisler/misc/gracectrl.in \
+$(GRLIB)/lib/gaisler/misc/i2c.in \
+$(GRLIB)/lib/gaisler/misc/ps2vga.in \
 $(GRLIB)/lib/gaisler/misc/i2cslv.in \
-$(GRLIB)/lib/gaisler/misc/gptimer.in \
-$(GRLIB)/lib/gaisler/misc/spictrl.in \
 $(GRLIB)/lib/gaisler/misc/svgactrl.in \
-$(GRLIB)/lib/gaisler/misc/ahbstat.in \
-$(GRLIB)/lib/gaisler/misc/ahbram.in \
-$(GRLIB)/lib/gaisler/misc/ps2vga.in \
+$(GRLIB)/lib/gaisler/misc/grsysmon.in \
 $(GRLIB)/lib/gaisler/misc/ahbrom.in \
+$(GRLIB)/lib/gaisler/misc/ahbram.in \
 $(GRLIB)/lib/gaisler/misc/grgpio.in \
-$(GRLIB)/lib/gaisler/misc/i2c.in \
+$(GRLIB)/lib/gaisler/misc/ahbstat.in \
+$(GRLIB)/lib/gaisler/misc/grgpio2.in \
+$(GRLIB)/lib/gaisler/misc/gptimer.in \
 $(GRLIB)/lib/gaisler/misc/ps2.in \
-$(GRLIB)/lib/gaisler/grusbhc/grusbhc.in \
-$(GRLIB)/lib/gaisler/can/can_mc.in \
-$(GRLIB)/lib/gaisler/can/can_oc.in \
-$(GRLIB)/lib/gaisler/can/grcan.in \
-$(GRLIB)/lib/gaisler/memctrl/ssrctrl.in \
-$(GRLIB)/lib/gaisler/memctrl/sdctrl.in \
-$(GRLIB)/lib/gaisler/memctrl/spimctrl.in \
-$(GRLIB)/lib/gaisler/memctrl/srctrl.in \
-$(GRLIB)/lib/gaisler/ata/ata.in \
-$(GRLIB)/lib/gaisler/greth/greth.in \
+$(GRLIB)/lib/gaisler/misc/spictrl.in \
 $(GRLIB)/lib/gaisler/ddr/ddrsp.in \
-$(GRLIB)/lib/gaisler/ddr/ddrctrl.in \
 $(GRLIB)/lib/gaisler/ddr/ddr2sp.in \
-$(GRLIB)/lib/gaisler/pci/pci.in \
-$(GRLIB)/lib/gaisler/pci/pci_target.in \
-$(GRLIB)/lib/gaisler/pci/pci_mtf.in \
-$(GRLIB)/lib/gaisler/pci/pcitrace.in \
-$(GRLIB)/lib/gaisler/pci/pcidma.in \
-$(GRLIB)/lib/gaisler/uart/dcom.in \
-$(GRLIB)/lib/gaisler/uart/uart1.in \
-$(GRLIB)/lib/gaisler/uart/uart2.in \
-$(GRLIB)/lib/gaisler/coremp7/cmp7grlib.in \
-$(GRLIB)/lib/grlib/amba/amba.in \
+$(GRLIB)/lib/gaisler/ddr/ddrctrl.in \
+$(GRLIB)/lib/gaisler/jtag/jtag.in \
+$(GRLIB)/lib/gaisler/greth/greth.in \
 $(GRLIB)/lib/grlib/util/debug.in \
-$(GRLIB)/lib/gleichmann/multiio/multiio.in \
+$(GRLIB)/lib/grlib/amba/amba.in \
 $(GRLIB)/lib/gleichmann/ac97/ac97_oc.in \
+$(GRLIB)/lib/gleichmann/spi/spi_oc.in \
 $(GRLIB)/lib/gleichmann/dac/adcdac.in \
 $(GRLIB)/lib/gleichmann/dac/dac_ahb.in \
-$(GRLIB)/lib/gleichmann/spi/spi_oc.in \
 $(GRLIB)/lib/gleichmann/ahb2hpi/ahb2hpi.in \
-$(GRLIB)/lib/esa/pci/pci_arb.in \
-$(GRLIB)/lib/esa/memoryctrl/mctrl.in \
+$(GRLIB)/lib/gleichmann/multiio/multiio.in \
+$(GRLIB)/lib/techmap/gencomp/clkgen.in \
+$(GRLIB)/lib/techmap/gencomp/tech.in \
+$(GRLIB)/lib/techmap/clocks/clkgen.in \
 
-HELPDEP = $(GRLIB)/lib/techmap/gencomp/clkgen.in.help \
-$(GRLIB)/lib/techmap/gencomp/tech.in.help \
-$(GRLIB)/lib/techmap/clocks/clkgen.in.help \
-$(GRLIB)/lib/gaisler/leon3/leon3.in.help \
-$(GRLIB)/lib/gaisler/leon3/irqmp.in.help \
-$(GRLIB)/lib/gaisler/spacewire/spacewire.in.help \
-$(GRLIB)/lib/gaisler/jtag/jtag.in.help \
+HELPDEP = $(GRLIB)/lib/esa/memoryctrl/mctrl.in.help \
+$(GRLIB)/lib/esa/pci/pci_arb.in.help \
 $(GRLIB)/lib/gaisler/net/edcl.in.help \
-$(GRLIB)/lib/gaisler/usb/usb.in.help \
-$(GRLIB)/lib/gaisler/usb/usbdcl.in.help \
-$(GRLIB)/lib/gaisler/misc/grgpio.in.help \
-$(GRLIB)/lib/gaisler/misc/ahbrom.in.help \
-$(GRLIB)/lib/gaisler/misc/svgactrl.in.help \
-$(GRLIB)/lib/gaisler/misc/i2cslv.in.help \
-$(GRLIB)/lib/gaisler/misc/ahbstat.in.help \
-$(GRLIB)/lib/gaisler/misc/ahbram.in.help \
-$(GRLIB)/lib/gaisler/misc/ps2vga.in.help \
-$(GRLIB)/lib/gaisler/misc/ps2.in.help \
-$(GRLIB)/lib/gaisler/misc/gptimer.in.help \
-$(GRLIB)/lib/gaisler/misc/i2c.in.help \
-$(GRLIB)/lib/gaisler/misc/spictrl.in.help \
-$(GRLIB)/lib/gaisler/grusbhc/grusbhc.in.help \
+$(GRLIB)/lib/gaisler/usb/grusb_dcl.in.help \
+$(GRLIB)/lib/gaisler/usb/grusbdc.in.help \
+$(GRLIB)/lib/gaisler/usb/grusbhc.in.help \
+$(GRLIB)/lib/gaisler/ata/ata.in.help \
+$(GRLIB)/lib/gaisler/uart/dcom.in.help \
+$(GRLIB)/lib/gaisler/uart/uart1.in.help \
+$(GRLIB)/lib/gaisler/uart/uart2.in.help \
+$(GRLIB)/lib/gaisler/spacewire/spacewire.in.help \
 $(GRLIB)/lib/gaisler/can/grcan.in.help \
-$(GRLIB)/lib/gaisler/can/can_mc.in.help \
 $(GRLIB)/lib/gaisler/can/can_oc.in.help \
-$(GRLIB)/lib/gaisler/memctrl/sdctrl.in.help \
+$(GRLIB)/lib/gaisler/can/can_mc.in.help \
+$(GRLIB)/lib/gaisler/leon3/leon3.in.help \
+$(GRLIB)/lib/gaisler/leon3/irqmp.in.help \
+$(GRLIB)/lib/gaisler/pci/pcitrace.in.help \
+$(GRLIB)/lib/gaisler/pci/pci.in.help \
 $(GRLIB)/lib/gaisler/memctrl/ssrctrl.in.help \
+$(GRLIB)/lib/gaisler/memctrl/sdctrl.in.help \
 $(GRLIB)/lib/gaisler/memctrl/spimctrl.in.help \
 $(GRLIB)/lib/gaisler/memctrl/srctrl.in.help \
-$(GRLIB)/lib/gaisler/ata/ata.in.help \
-$(GRLIB)/lib/gaisler/greth/greth.in.help \
-$(GRLIB)/lib/gaisler/ddr/ddr2sp.in.help \
-$(GRLIB)/lib/gaisler/ddr/ddrctrl.in.help \
+$(GRLIB)/lib/gaisler/misc/grgpio.in.help \
+$(GRLIB)/lib/gaisler/misc/grsysmon.in.help \
+$(GRLIB)/lib/gaisler/misc/gptimer.in.help \
+$(GRLIB)/lib/gaisler/misc/ahbram.in.help \
+$(GRLIB)/lib/gaisler/misc/spictrl.in.help \
+$(GRLIB)/lib/gaisler/misc/ps2.in.help \
+$(GRLIB)/lib/gaisler/misc/i2c.in.help \
+$(GRLIB)/lib/gaisler/misc/svgactrl.in.help \
+$(GRLIB)/lib/gaisler/misc/ps2vga.in.help \
+$(GRLIB)/lib/gaisler/misc/i2cslv.in.help \
+$(GRLIB)/lib/gaisler/misc/ahbstat.in.help \
+$(GRLIB)/lib/gaisler/misc/gracectrl.in.help \
+$(GRLIB)/lib/gaisler/misc/grgpio2.in.help \
+$(GRLIB)/lib/gaisler/misc/ahbrom.in.help \
 $(GRLIB)/lib/gaisler/ddr/ddrsp.in.help \
-$(GRLIB)/lib/gaisler/pci/pcitrace.in.help \
-$(GRLIB)/lib/gaisler/pci/pci.in.help \
-$(GRLIB)/lib/gaisler/uart/uart1.in.help \
-$(GRLIB)/lib/gaisler/uart/uart2.in.help \
-$(GRLIB)/lib/gaisler/uart/dcom.in.help \
-$(GRLIB)/lib/gaisler/coremp7/cmp7grlib.in.help \
-$(GRLIB)/lib/grlib/amba/amba.in.help \
+$(GRLIB)/lib/gaisler/ddr/ddrctrl.in.help \
+$(GRLIB)/lib/gaisler/ddr/ddr2sp.in.help \
+$(GRLIB)/lib/gaisler/jtag/jtag.in.help \
+$(GRLIB)/lib/gaisler/greth/greth.in.help \
 $(GRLIB)/lib/grlib/util/debug.in.help \
-$(GRLIB)/lib/gleichmann/multiio/multiio.in.help \
+$(GRLIB)/lib/grlib/amba/amba.in.help \
 $(GRLIB)/lib/gleichmann/ac97/ac97_oc.in.help \
-$(GRLIB)/lib/gleichmann/dac/adcdac.in.help \
-$(GRLIB)/lib/gleichmann/dac/dac_ahb.in.help \
 $(GRLIB)/lib/gleichmann/spi/spi_oc.in.help \
+$(GRLIB)/lib/gleichmann/dac/dac_ahb.in.help \
+$(GRLIB)/lib/gleichmann/dac/adcdac.in.help \
 $(GRLIB)/lib/gleichmann/ahb2hpi/ahb2hpi.in.help \
-$(GRLIB)/lib/esa/pci/pci_arb.in.help \
-$(GRLIB)/lib/esa/memoryctrl/mctrl.in.help \
+$(GRLIB)/lib/gleichmann/multiio/multiio.in.help \
+$(GRLIB)/lib/techmap/gencomp/tech.in.help \
+$(GRLIB)/lib/techmap/gencomp/clkgen.in.help \
+$(GRLIB)/lib/techmap/clocks/clkgen.in.help \
 

bin/ahbrom.c

@@ -4,6 +4,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#ifdef WIN32
+#include <winsock2.h>
+#endif
 
 main (argc, argv)
   int argc; char **argv;
@@ -28,21 +31,13 @@ main (argc, argv)
   fprintf(wfp, "\n\
 ----------------------------------------------------------------------------\n\
 --  This file is a part of the GRLIB VHDL IP LIBRARY\n\
---  Copyright (C) 2004 GAISLER RESEARCH\n\
---\n\
---  This program is free software; you can redistribute it and/or modify\n\
---  it under the terms of the GNU General Public License as published by\n\
---  the Free Software Foundation; either version 2 of the License, or\n\
---  (at your option) any later version.\n\
---\n\
---  See the file COPYING for the full details of the license.\n\
---\n\
------------------------------------------------------------------------------\n\
+--  Copyright (C) 2010 Aeroflex Gaisler\n\
+----------------------------------------------------------------------------\n\
 -- Entity: 	ahbrom\n\
 -- File:	ahbrom.vhd\n\
 -- Author:	Jiri Gaisler - Gaisler Research\n\
 -- Description:	AHB rom. 0/1-waitstate read\n\
-------------------------------------------------------------------------------\n\
+----------------------------------------------------------------------------\n\
 library ieee;\n\
 use ieee.std_logic_1164.all;\n\
 library grlib;\n\