From 2b7b38d1dc6fc51eeddfff19ec836951d2df4ef6 Mon Sep 17 00:00:00 2001 From: antoniovillena Date: Fri, 27 May 2016 20:38:49 +0200 Subject: [PATCH] =?UTF-8?q?Descomento=20l=C3=ADneas=2019=20y=2020=20de=20l?= =?UTF-8?q?a=20SRAM=20en=20el=20ucf=20de=20protos=20anteriores?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/Spectrum/pines_zxuno_Ap.ucf | 4 ++-- cores/Spectrum/pines_zxuno_v2.ucf | 4 ++-- cores/Spectrum/pines_zxuno_v3.ucf | 4 ++-- firmware/bootloader.asm | 20 ++++++++++---------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cores/Spectrum/pines_zxuno_Ap.ucf b/cores/Spectrum/pines_zxuno_Ap.ucf index ec0fd2b..f7e4fbb 100644 --- a/cores/Spectrum/pines_zxuno_Ap.ucf +++ b/cores/Spectrum/pines_zxuno_Ap.ucf @@ -48,8 +48,8 @@ NET "sram_addr<15>" LOC="P140" | IOSTANDARD = LVCMOS33; NET "sram_addr<16>" LOC="P139" | IOSTANDARD = LVCMOS33; NET "sram_addr<17>" LOC="P141" | IOSTANDARD = LVCMOS33; NET "sram_addr<18>" LOC="P138" | IOSTANDARD = LVCMOS33; -#NET "sram_addr<19>" LOC="P111" | IOSTANDARD = LVCMOS33; -#NET "sram_addr<20>" LOC="P138" | IOSTANDARD = LVCMOS33; +NET "sram_addr<19>" LOC="P111" | IOSTANDARD = LVCMOS33; +NET "sram_addr<20>" LOC="P138" | IOSTANDARD = LVCMOS33; NET "sram_data<0>" LOC="P114" | IOSTANDARD = LVCMOS33; NET "sram_data<1>" LOC="P112" | IOSTANDARD = LVCMOS33; diff --git a/cores/Spectrum/pines_zxuno_v2.ucf b/cores/Spectrum/pines_zxuno_v2.ucf index 9d8fdd1..f75c0a6 100644 --- a/cores/Spectrum/pines_zxuno_v2.ucf +++ b/cores/Spectrum/pines_zxuno_v2.ucf @@ -48,8 +48,8 @@ NET "sram_addr<15>" LOC="P140" | IOSTANDARD = LVCMOS33; NET "sram_addr<16>" LOC="P139" | IOSTANDARD = LVCMOS33; NET "sram_addr<17>" LOC="P141" | IOSTANDARD = LVCMOS33; NET "sram_addr<18>" LOC="P138" | IOSTANDARD = LVCMOS33; -#NET "sram_addr<19>" LOC="P111" | IOSTANDARD = LVCMOS33; -#NET "sram_addr<20>" LOC="P138" | IOSTANDARD = LVCMOS33; +NET "sram_addr<19>" LOC="P111" | IOSTANDARD = LVCMOS33; +NET "sram_addr<20>" LOC="P138" | IOSTANDARD = LVCMOS33; NET "sram_data<0>" LOC="P114" | IOSTANDARD = LVCMOS33; NET "sram_data<1>" LOC="P112" | IOSTANDARD = LVCMOS33; diff --git a/cores/Spectrum/pines_zxuno_v3.ucf b/cores/Spectrum/pines_zxuno_v3.ucf index 0fb20c2..488ae88 100644 --- a/cores/Spectrum/pines_zxuno_v3.ucf +++ b/cores/Spectrum/pines_zxuno_v3.ucf @@ -48,8 +48,8 @@ NET "sram_addr<15>" LOC="P131" | IOSTANDARD = LVCMOS33; NET "sram_addr<16>" LOC="P133" | IOSTANDARD = LVCMOS33; NET "sram_addr<17>" LOC="P134" | IOSTANDARD = LVCMOS33; NET "sram_addr<18>" LOC="P137" | IOSTANDARD = LVCMOS33; -#NET "sram_addr<19>" LOC="P111" | IOSTANDARD = LVCMOS33; -#NET "sram_addr<20>" LOC="P138" | IOSTANDARD = LVCMOS33; +NET "sram_addr<19>" LOC="P111" | IOSTANDARD = LVCMOS33; +NET "sram_addr<20>" LOC="P138" | IOSTANDARD = LVCMOS33; NET "sram_data<0>" LOC="P132" | IOSTANDARD = LVCMOS33; NET "sram_data<1>" LOC="P126" | IOSTANDARD = LVCMOS33; diff --git a/firmware/bootloader.asm b/firmware/bootloader.asm index c17943b..6d4c574 100644 --- a/firmware/bootloader.asm +++ b/firmware/bootloader.asm @@ -13,7 +13,7 @@ define scandbl_ctrl 11 di - ld sp, $bfff-68 + ld sp, $bfff-67 ld de, $c761 ; tras el out (c), h de bffc se ejecuta push de ; un rst 0 para iniciar la nueva ROM ld de, $ed80 ; en $bffc para evitar que el cambio de ROM @@ -46,12 +46,12 @@ rst28 ld bc, zxuno_port + $100 jp (hl) lspi2 wreg scandbl_ctrl, $c0 ; lo pongo a 28MHz - jr lspi3 + push de ; colisione con la siguiente instruccion + defb $fe -rst38 jp $c043 +rst38 jp $c006 -lspi3 push de ; colisione con la siguiente instruccion - wreg flash_cs, 1 ; desactivamos spi, enviando un 0 +lspi3 wreg flash_cs, 1 ; desactivamos spi, enviando un 0 wreg master_mapper, 8 ; paginamos la ROM en $c000 wreg flash_cs, 0 ; activamos spi, enviando un 0 wreg flash_spi, 3 ; envio flash_spi un 3, orden de lectura @@ -69,12 +69,12 @@ boot ini out (c), h ; a master_conf quiero enviar un 0 para pasar inc b cp %00011000 ; arriba y disparo a la vez - ld de, $bffc-68 + ld de, $bffc-67 push de - ret nz + ld ixh, e jr nbreak -nmi66 jp $c040 +nmi66 jp $c003 retn lcont ld a, c ; fetch comparison value. @@ -83,8 +83,8 @@ lcont ld a, c ; fetch comparison value. out ($fe), a ; send to port to effect the change of colour. ret ; return. -nbreak ld de, $0051+2 - ld ixh, e +nbreak ret nz + ld de, $0051+2 call lbytes ld ix, $c000 ld de, $4000+2