]> rtime.felk.cvut.cz Git - fpga/lx-cpu1/lx-rocon.git/commitdiff
Cleanup (whitespace, etc.)
authorMartin Meloun <meloumar@cmp.felk.cvut.cz>
Fri, 23 May 2014 17:42:11 +0000 (19:42 +0200)
committerMartin Meloun <meloumar@cmp.felk.cvut.cz>
Fri, 23 May 2014 17:42:11 +0000 (19:42 +0200)
Signed-off-by: Martin Meloun <meloumar@cmp.felk.cvut.cz>
hw/lx_rocon_top.prj
hw/tb/lx_rocon_top_tb.vhd
sw/app/rocon/appl_usb.c

index 8ed8bbe7e98a6e887839802968740fc8bb4f5834..c554599e5f6835a8cb2b0a61f1ba3a15c2fd3e85 100644 (file)
@@ -1,9 +1,9 @@
+vhdl work "util_pkg.vhd"
 vhdl work "tumbl/mbl_pkg.vhd"
 vhdl work "lx_rocon_pkg.vhd"
 vhdl work "xilinx_dualport_bram_write_first.vhd"
 vhdl work "dff2.vhd"
 vhdl work "xilinx_dualport_bram_no_change.vhd"
-vhdl work "util_pkg.vhd"
 vhdl work "tumbl/mem.vhd"
 vhdl work "tumbl/fetch.vhd"
 vhdl work "tumbl/exeq.vhd"
index 60244ff33053c4012661762a39bf75b264ac7a78..79f2bc21f68ac56528021df1815c65432c09e73e 100644 (file)
@@ -103,18 +103,18 @@ BEGIN
    -- Clock process definitions
 --   clk_cpu_process :process
 --   begin
---             clk_cpu <= '0';
---             wait for clk_period_cpu/2;
 --             clk_cpu <= '1';
 --             wait for clk_period_cpu/2;
+--             clk_cpu <= '0';
+--             wait for clk_period_cpu/2;
 --   end process;
 
         clk_50m_process :process
    begin
-               clk_50m <= '0';
-               wait for clk_period_50m/2;
                clk_50m <= '1';
                wait for clk_period_50m/2;
+               clk_50m <= '0';
+               wait for clk_period_50m/2;
    end process;
 
 
index d6b7529adc42504096500213ddc7fd1cb7079a9a..459e771a06faede50cfb2ea97463cba952ba1cdf 100644 (file)
@@ -143,9 +143,9 @@ static int usb_flash_pkt_wr(struct usb_ep_t *ep, int len, int code)
 static int usb_tumbl_pkt_wr(struct usb_ep_t *ep, int len, int code)
 {
   unsigned char *ptr = ep->ptr - len;
-  
+
   appl_fpga_tumbl_write(ep->user_data, ptr, len);
-  
+
   ep->user_data += len;
   ep->ptr = ep0_buffer;
   return USB_COMPLETE_OK;
@@ -177,7 +177,7 @@ uint16_t vendor_call_ret = 0xFFFF;
 uint16_t appl_usb_vendor_call(uint16_t command, uint16_t argument)
 {
   int i, j;
-  
+
   switch (command)
   {
     case USB_CMD_FPGA_CONFIGURE:
@@ -219,42 +219,42 @@ uint16_t appl_usb_vendor_call(uint16_t command, uint16_t argument)
 
     case USB_CMD_FPGA_TUMBL_SET_RESET:
       return appl_fpga_tumbl_set_reset(argument);
-    
+
     case USB_CMD_FPGA_TUMBL_SET_HALT:
       return appl_fpga_tumbl_set_halt(argument);
-    
+
     case USB_CMD_FPGA_TUMBL_SET_TRACE:
       return appl_fpga_tumbl_set_trace(argument);
-      
+
     case USB_CMD_FPGA_TUMBL_KICK_TRACE:
       return appl_fpga_tumbl_kick_trace();
-      
+
     case USB_CMD_FPGA_TUMBL_GET_PC:
       printf("Tubml PC: 0x%08X\n", (unsigned int) *tumbl_pc);
       return 0;
-    
+
     case USB_CMD_FPGA_TUMBL_DUMP_IMEM:
       printf("TUMBL IMEM:\n");
       for (i = 0; i < 64; i++)
-      {        
+      {
         for (j = 0; j < 8; j++)
           printf("%08X ", (unsigned int) tumbl_imem[i*8 + j]);
-          
+
         printf("\n");
       }
       return 0;
-      
+
     case USB_CMD_FPGA_TUMBL_DUMP_DMEM:
       printf("TUMBL DMEM:\n");
       for (i = 0; i < 128; i++)
       {
         for (j = 0; j < 8; j++)
           printf("%08X ", (unsigned int) tumbl_dmem[i*8 + j]);
-          
+
         printf("\n");
       }
       return 0;
-      
+
     case USB_CMD_FPGA_RESET:
       hal_gpio_direction_output(XC_INIT_PIN, 0);
 
@@ -341,7 +341,7 @@ int appl_usb_vendor(usb_device_t *udev)
             udev->ep0.user_data = addr;
             udev->ep0.ptr = ep0_buffer;
             break;
-            
+
           case USB_VENDOR_TARGET_TUMBL:
             udev->ep0.next_pkt_fnc = usb_tumbl_pkt_wr;
             udev->ep0.user_data = addr;