Skip to content

GitLab

Commit 7e1863f3 authored by beeanyew's avatar beeanyew
Browse files

Merge pull request 'video_mode_things' (#7) from... 

Merge pull request 'video_mode_things' (#7) from shanshe/zz9000-firmware:video_mode_things into video_mode_things
parents 63f77a68 de0dafba
Hide whitespace changes
Inline Side-by-side
ZZ9000_proto.sdk/ZZ9000OS/src/ethernet.c
View file @ 7e1863f3
......@@ -431,7 +431,7 @@ int ethernet_get_backlog() {
return frames_backlog;
}
void ethernet_receive_frame() {
int ethernet_receive_frame() {
// TODO disable interrupts while here
uint8_t* frm = ethernet_current_receive_ptr();
......@@ -447,8 +447,10 @@ void ethernet_receive_frame() {
//printf("EMAC: caught up with backlog\n");
}
} else {
printf("EMAC: ethernet_receive_frame() called but backlog is empty\n");
// this is NOT an error, Amiga wants data and there is no data on RX buffers
// printf("EMAC: ethernet_receive_frame() called but backlog is empty\n");
}
return(frames_received_from_backlog);
}
u32 get_frames_received() {
......
ZZ9000_proto.sdk/ZZ9000OS/src/ethernet.h
View file @ 7e1863f3
......@@ -19,7 +19,7 @@
int ethernet_init();
u16 ethernet_send_frame(u16 frame_size);
void ethernet_receive_frame();
int ethernet_receive_frame();
u32 get_frames_received();
uint8_t* ethernet_get_mac_address_ptr();
void ethernet_update_mac_address();
......
ZZ9000_proto.sdk/ZZ9000OS/src/main.c
View file @ 7e1863f3
......@@ -494,6 +494,8 @@ void pixelclock_init_2(struct zz_video_mode *mode) {
#define MNTZORRO_REG1 4
#define MNTZORRO_REG2 8
#define MNTZORRO_REG3 12
#define MNTZORRO_REG4 16
#define MNTZORRO_REG5 20
#define mntzorro_read(BaseAddress, RegOffset) \
Xil_In32((BaseAddress) + (RegOffset))
......@@ -1017,9 +1019,10 @@ int main() {
int interrupt_enabled = 0;
int request_video_align=0;
int old_vblank = 0;
XTime time1 = 0, time2 = 0;
// int old_vblank = 0;
// XTime time1 = 0, time2 = 0;
int vblank=0;
int frfb=0;
int custom_video_mode = ZZVMODE_CUSTOM;
int custom_vmode_param = VMODE_PARAM_HRES;
......@@ -1724,7 +1727,8 @@ int main() {
break;
case REG_ZZ_ETH_RX:
//printf("RECV eth frame sz: %ld\n",zdata);
ethernet_receive_frame();
frfb=ethernet_receive_frame();
mntzorro_write(MNTZ_BASE_ADDR, MNTZORRO_REG4, frfb);
break;
case REG_ZZ_ETH_MAC_HI: {
uint8_t* mac = ethernet_get_mac_address_ptr();
......@@ -1786,12 +1790,13 @@ int main() {
case REG_ZZ_USB_BUFSEL: {
//printf("[USB] select buffer: %d\n", zdata);
usb_selected_buffer_block = zdata;
mntzorro_write(MNTZ_BASE_ADDR, MNTZORRO_REG5, usb_selected_buffer_block);
break;
}
case REG_ZZ_DEBUG: {
//debug_lowlevel = zdata;
debug_dma_op[zdata] = !debug_dma_op[zdata];
printf("Debug for DMA RTG op %d %s.\n", zdata, (debug_dma_op[zdata]) ? "Enabled" : "Disabled");
printf("Debug for DMA RTG op %ld %s.\n", zdata, (debug_dma_op[zdata]) ? "Enabled" : "Disabled");
break;
}
......
ZZ9000_proto.sdk/ZZ9000OS/src/usb/ehci-hcd.c
View file @ 7e1863f3
......@@ -30,16 +30,17 @@ uint32_t virt_to_phys(void* addr) {
}
// FIXME
int tmr=0;
unsigned long tmr=0;
void udelay(int us) {
usleep(us);
}
void mdelay(int ms) {
usleep(1000*ms);
}
int get_timer(int i) {
unsigned long get_timer(unsigned long i) {
mdelay(1);
return tmr++;
tmr++;
return (tmr-i);
}
#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
......@@ -256,7 +257,7 @@ static int ehci_td_buffer(struct qTD *td, void *buf, size_t sz)
int idx;
if (addr != ALIGN(addr, ARCH_DMA_MINALIGN))
printf("EHCI-HCD: Misaligned buffer address (%p vs %x)\n", buf, ALIGN(addr, ARCH_DMA_MINALIGN));
printf("EHCI-HCD: Misaligned buffer address (%p vs %lx)\n", buf, ALIGN(addr, ARCH_DMA_MINALIGN));
flush_dcache_range(addr, ALIGN(addr + sz, ARCH_DMA_MINALIGN));
......@@ -322,7 +323,7 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
uint32_t endpt, maxpacket, token, usbsts;
uint32_t c, toggle;
uint32_t cmd;
int timeout;
unsigned long timeout;
int ret = 0;
struct ehci_ctrl *ctrl = ehci_get_ctrl(dev);
......
ZZ9000_proto.sdk/ZZ9000OS/src/usb/usb.c
View file @ 7e1863f3
......@@ -33,6 +33,8 @@
#include <stdio.h>
#include <string.h>
void mdelay(int ms);
static inline void *malloc_cache_aligned(size_t size)
{
return memalign(ARCH_DMA_MINALIGN, ALIGN(size, ARCH_DMA_MINALIGN));
......
ZZ9000_proto.sdk/ZZ9000OS/src/usb/usb.h
View file @ 7e1863f3
......@@ -49,7 +49,7 @@
* This is the timeout to allow for submitting an urb in ms. We allow more
* time for a BULK device to react - some are slow.
*/
#define USB_TIMEOUT_MS(pipe) (usb_pipebulk(pipe) ? 20000 : 4000) // FIXME quadrupled
#define USB_TIMEOUT_MS(pipe) (usb_pipebulk(pipe) ? 500 : 100) // FIXME quadrupled, shanshe restored original values
/* device request (setup) */
struct devrequest {
......
ZZ9000_proto.sdk/ZZ9000OS/src/usb/usb_hub.c
View file @ 7e1863f3
......@@ -36,6 +36,9 @@
#include "usb.h"
unsigned long get_timer(unsigned long i);
void mdelay(int ms);
#define max(x, y) ({ \
typeof(x) _max1 = (x); \
typeof(y) _max2 = (y); \
......@@ -400,7 +403,7 @@ static int usb_scan_port(struct usb_device_scan *usb_scan)
portstatus = le16_to_cpu(portsts->wPortStatus);
portchange = le16_to_cpu(portsts->wPortChange);
printf("[usb-hub] Port %d Status %X Change %X\n", i + 1, portstatus, portchange);
// printf("[usb-hub] Port %d Status %X Change %X\n", i + 1, portstatus, portchange);
/*
* No connection change happened, wait a bit more.
......
ZZ9000_proto.sdk/ZZ9000OS/src/usb/usb_storage.c
View file @ 7e1863f3
......@@ -44,6 +44,8 @@
#undef BBB_COMDAT_TRACE
#undef BBB_XPORT_TRACE
void mdelay(int ms);
#include "scsi.h"
/* direction table -- this indicates the direction of the data
* transfer for each command code -- a 1 indicates input
......
mntzorro.v
View file @ 7e1863f3
......@@ -28,7 +28,7 @@
//`define VARIANT_FW20
`define C_S_AXI_DATA_WIDTH 32
`define C_S_AXI_ADDR_WIDTH 4
`define C_S_AXI_ADDR_WIDTH 5
`define RAM_SIZE 32'h400000 // 4MB for Zorro 2
`define REG_SIZE 32'h01000
`define AUTOCONF_LOW 24'he80000
......@@ -37,6 +37,10 @@
`define ARM_MEMORY_START 32'h001f0000
`define VIDEOCAP_ADDR 32'h01000000 // ARM_MEMORY_START+0xe0_0000
`define TX_FRAME_ADDRESS 32'h03110000
`define RX_FRAME_ADDRESS 32'h03120000
`define RX_BACKLOG_ADDRESS 32'h03200000
`define FRAME_SIZE 24'h2048
`define USB_BLOCK_STORAGE_ADDRESS 32'h04000000
`define C_M00_AXI_TARGET_SLAVE_BASE_ADDR 32'h10000000
`define C_M00_AXI_ID_WIDTH 1
......@@ -268,7 +272,7 @@ module MNTZorro_v0_1_S00_AXI
// ADDR_LSB = 2 for 32 bits (n downto 2)
// ADDR_LSB = 3 for 64 bits (n downto 3)
localparam integer ADDR_LSB = (`C_S_AXI_DATA_WIDTH/32) + 1;
localparam integer OPT_MEM_ADDR_BITS = 1;
localparam integer OPT_MEM_ADDR_BITS = 2;
//----------------------------------------------
//-- Signals for user logic register space example
//------------------------------------------------
......@@ -277,6 +281,8 @@ module MNTZorro_v0_1_S00_AXI
reg [`C_S_AXI_DATA_WIDTH-1:0] slv_reg1;
reg [`C_S_AXI_DATA_WIDTH-1:0] slv_reg2;
reg [`C_S_AXI_DATA_WIDTH-1:0] slv_reg3;
reg [`C_S_AXI_DATA_WIDTH-1:0] slv_reg4;
reg [`C_S_AXI_DATA_WIDTH-1:0] slv_reg5;
wire slv_reg_rden;
wire slv_reg_wren;
reg [`C_S_AXI_DATA_WIDTH-1:0] reg_data_out;
......@@ -398,44 +404,62 @@ module MNTZorro_v0_1_S00_AXI
slv_reg1 <= 0;
slv_reg2 <= 0;
slv_reg3 <= 0;
end
slv_reg4 <= 0;
slv_reg5 <= 0;
end
else begin
if (slv_reg_wren)
begin
case ( axi_awaddr[ADDR_LSB+OPT_MEM_ADDR_BITS:ADDR_LSB] )
2'h0:
3'h0:
for ( byte_index = 0; byte_index <= (`C_S_AXI_DATA_WIDTH/8)-1; byte_index = byte_index+1 )
if ( S_AXI_WSTRB[byte_index] == 1 ) begin
// Respective byte enables are asserted as per write strobes
// Slave register 0
slv_reg0[(byte_index*8) +: 8] <= S_AXI_WDATA[(byte_index*8) +: 8];
end
2'h1:
end
3'h1:
for ( byte_index = 0; byte_index <= (`C_S_AXI_DATA_WIDTH/8)-1; byte_index = byte_index+1 )
if ( S_AXI_WSTRB[byte_index] == 1 ) begin
// Respective byte enables are asserted as per write strobes
// Slave register 1
slv_reg1[(byte_index*8) +: 8] <= S_AXI_WDATA[(byte_index*8) +: 8];
end
2'h2:
end
3'h2:
for ( byte_index = 0; byte_index <= (`C_S_AXI_DATA_WIDTH/8)-1; byte_index = byte_index+1 )
if ( S_AXI_WSTRB[byte_index] == 1 ) begin
// Respective byte enables are asserted as per write strobes
// Slave register 2
slv_reg2[(byte_index*8) +: 8] <= S_AXI_WDATA[(byte_index*8) +: 8];
end
2'h3:
end
3'h3:
for ( byte_index = 0; byte_index <= (`C_S_AXI_DATA_WIDTH/8)-1; byte_index = byte_index+1 )
if ( S_AXI_WSTRB[byte_index] == 1 ) begin
// Respective byte enables are asserted as per write strobes
// Slave register 3
slv_reg3[(byte_index*8) +: 8] <= S_AXI_WDATA[(byte_index*8) +: 8];
end
end
3'h4:
for ( byte_index = 0; byte_index <= (`C_S_AXI_DATA_WIDTH/8)-1; byte_index = byte_index+1 )
if ( S_AXI_WSTRB[byte_index] == 1 ) begin
// Respective byte enables are asserted as per write strobes
// Slave register 4
slv_reg4[(byte_index*8) +: 8] <= S_AXI_WDATA[(byte_index*8) +: 8];
end
3'h5:
for ( byte_index = 0; byte_index <= (`C_S_AXI_DATA_WIDTH/8)-1; byte_index = byte_index+1 )
if ( S_AXI_WSTRB[byte_index] == 1 ) begin
// Respective byte enables are asserted as per write strobes
// Slave register 4
slv_reg5[(byte_index*8) +: 8] <= S_AXI_WDATA[(byte_index*8) +: 8];
end
default : begin
slv_reg0 <= slv_reg0;
slv_reg1 <= slv_reg1;
slv_reg2 <= slv_reg2;
slv_reg3 <= slv_reg3;
slv_reg4 <= slv_reg4;
slv_reg5 <= slv_reg5;
end
endcase
end
......@@ -637,6 +661,7 @@ module MNTZorro_v0_1_S00_AXI
reg zorro_write;
reg zorro_interrupt;
reg clear_interrupt;
assign ZORRO_INT6 = zorro_interrupt;
reg [15:0] data_in;
......@@ -904,6 +929,10 @@ module MNTZorro_v0_1_S00_AXI
reg [31:0] axi_reg1;
reg [31:0] axi_reg2;
reg [31:0] axi_reg3;
reg [31:0] axi_reg4;
reg [31:0] axi_reg5;
reg [31:0] frfb;
reg [31:0] usbb;
reg [31:0] video_control_data_zorro;
reg [7:0] video_control_op_zorro;
......@@ -1841,7 +1870,7 @@ module MNTZorro_v0_1_S00_AXI
data_z3_low16 <= default_data;
slaven <= 1;
if (z3_mapped_addr<'h10000)
if (z3_mapped_addr<'h2000)
zorro_state <= Z3_READ_UPPER;
else
zorro_state <= WAIT_READ_DMA_Z3;
......@@ -1920,26 +1949,12 @@ module MNTZorro_v0_1_S00_AXI
`ifdef VARIANT_FW20
zorro_state <= Z3_WRITE_UPPER;
`else
if ( (z3_mapped_addr>='h8000)&&(z3_mapped_addr<'hA000) )
zorro_state <= WAIT_WRITE_DMA_Z3;
else if (z3_mapped_addr<'h10000)
if (z3_mapped_addr<'h2000)
zorro_state <= Z3_WRITE_UPPER;
else
zorro_state <= WAIT_WRITE_DMA_Z3;
`endif
end
/*Z3_WRITE_PRE2: begin
// FIXME DMA temporarily disabled for FW2.0
`ifdef VARIANT_FW20
zorro_state <= Z3_WRITE_UPPER;
`else
if (z3_mapped_addr<'h10000)
zorro_state <= Z3_WRITE_UPPER;
else
zorro_state <= WAIT_WRITE_DMA_Z3;
`endif
end*/
Z3_WRITE_UPPER: begin
last_z3addr <= z3_mapped_addr;
......@@ -1961,7 +1976,17 @@ module MNTZorro_v0_1_S00_AXI
end
WAIT_READ_DMA_Z3: begin
m00_axi_araddr <= `ARM_MEMORY_START + (z3_mapped_addr/*&32'hfffffffc*/); // max 256MB
if ( (z3_mapped_addr>='hA000)&&(z3_mapped_addr<'h10000) )
m00_axi_araddr <= (`USB_BLOCK_STORAGE_ADDRESS - 32'hA000) + z3_mapped_addr + {usbb[22:0],9'h0}; // 9'h0 is USB_BLOCK_SIZE = 512
else
if ( (z3_mapped_addr>='h8000)&&(z3_mapped_addr<'hA000) )
m00_axi_araddr <= (`TX_FRAME_ADDRESS - 32'h8000) + z3_mapped_addr;
else
if ( (z3_mapped_addr>='h2000)&&(z3_mapped_addr<'h8000) ) begin
m00_axi_araddr <= (`RX_BACKLOG_ADDRESS - 32'h2000) + z3_mapped_addr + {frfb[20:0],11'h0}; // 11'h0 is FRAME_SIZE = 2048
clear_interrupt<=1;
end else
m00_axi_araddr <= `ARM_MEMORY_START + (z3_mapped_addr/*&32'hfffffffc*/); // max 256MB
m00_axi_arvalid <= 1;
// m00_axi_rready <= 1;
if (m00_axi_arready) begin
......@@ -1974,23 +1999,25 @@ module MNTZorro_v0_1_S00_AXI
// m00_axi_rready <= 1;
if (m00_axi_rvalid) begin
zorro_state <= Z3_ENDCYCLE;
data_z3_hi16 <= {m00_axi_rdata[7:0], m00_axi_rdata[15:8]};
data_z3_low16 <= {m00_axi_rdata[23:16], m00_axi_rdata[31:24]};
dataout_z3 <= 1; // enable data output
dtack <= 1;
data_z3_hi16 <= {m00_axi_rdata[7:0], m00_axi_rdata[15:8]};
data_z3_low16 <= {m00_axi_rdata[23:16], m00_axi_rdata[31:24]};
dataout_z3 <= 1; // enable data output
dtack <= 1;
end
end
WAIT_WRITE_DMA_Z3: begin
m00_axi_wstrb_z3 <= {z3_ds0, z3_ds1, z3_ds2, z3_ds3};
if ( (z3_mapped_addr>='hA000)&&(z3_mapped_addr<'h10000) )
m00_axi_awaddr_z3 <= (`USB_BLOCK_STORAGE_ADDRESS - 32'hA000) + z3_mapped_addr + {usbb[22:0],9'h0}; // 9'h0 is USB_BLOCK_SIZE = 512
else
if ( (z3_mapped_addr>='h8000)&&(z3_mapped_addr<'hA000) )
m00_axi_awaddr_z3 <= (`TX_FRAME_ADDRESS - 32'h8000) + z3_mapped_addr;
else
m00_axi_awaddr_z3 <= `ARM_MEMORY_START + (z3_mapped_addr); // max 256MB
/*WAIT_WRITE_DMA_Z3: begin
m00_axi_wstrb_z3 <= {z3_ds0, z3_ds1, z3_ds2, z3_ds3};
m00_axi_awaddr_z3 <= `ARM_MEMORY_START + (z3_mapped_addr); // max 256MB */
if ( (z3_mapped_addr>='h2000)&&(z3_mapped_addr<'h8000) ) // this is marked in main.c as "FIXME remove"
m00_axi_awaddr_z3 <= (`RX_FRAME_ADDRESS - 32'h2000) + z3_mapped_addr;
else
m00_axi_awaddr_z3 <= `ARM_MEMORY_START + (z3_mapped_addr/*&32'hfffffffc*/); // max 256MB
m00_axi_wdata_z3 <= {z3_din_low_s2[7:0], z3_din_low_s2[15:8], z3_din_high_s2[7:0], z3_din_high_s2[15:8]};
m00_axi_awvalid_z3 <= 1;
......@@ -2099,15 +2126,23 @@ module MNTZorro_v0_1_S00_AXI
if (axi_reg2[30]==1'b1) begin
zorro_interrupt <= axi_reg2[0];
end
else if (clear_interrupt==1) begin
zorro_interrupt<=0;
clear_interrupt<=0;
end
// read / write request acknowledged by ARM
zorro_ram_read_flag <= axi_reg0[30];
zorro_ram_write_flag <= axi_reg0[31];
frfb <= axi_reg4;
usbb <= axi_reg5;
axi_reg0 <= slv_reg0;
axi_reg1 <= slv_reg1;
axi_reg2 <= slv_reg2;
axi_reg3 <= slv_reg3;
axi_reg4 <= slv_reg4;
axi_reg5 <= slv_reg5;
if (video_control_axi) begin
video_control_data <= video_control_data_axi;
......@@ -2146,10 +2181,10 @@ module MNTZorro_v0_1_S00_AXI
begin
// Address decoding for reading registers
case ( axi_araddr[ADDR_LSB+OPT_MEM_ADDR_BITS:ADDR_LSB] )
2'h0 : reg_data_out <= out_reg0;
2'h1 : reg_data_out <= out_reg1;
2'h2 : reg_data_out <= out_reg2;
2'h3 : reg_data_out <= out_reg3;
3'h0 : reg_data_out <= out_reg0;
3'h1 : reg_data_out <= out_reg1;
3'h2 : reg_data_out <= out_reg2;
3'h3 : reg_data_out <= out_reg3;
default : reg_data_out <= 'h0;
endcase
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment