diff --git a/NetBSD/9.0/usr/src/sys/dev/sbus/rdfpga.c b/NetBSD/9.0/usr/src/sys/dev/sbus/rdfpga.c index bd020fd..636f5a2 100644 --- a/NetBSD/9.0/usr/src/sys/dev/sbus/rdfpga.c +++ b/NetBSD/9.0/usr/src/sys/dev/sbus/rdfpga.c @@ -339,7 +339,7 @@ rdfpga_attach(device_t parent, device_t self, void *aux) if (sbusburst == 0) sbusburst = SBUS_BURST_32 - 1; /* 1->16 */ - sc->sc_burst = prom_getpropint(node, "slave-burst-sizes", -1); + sc->sc_burst = prom_getpropint(node, "burst-sizes", -1); if (sc->sc_burst == -1) /* take SBus burst sizes */ sc->sc_burst = sbusburst; @@ -348,10 +348,11 @@ rdfpga_attach(device_t parent, device_t self, void *aux) sc->sc_burst &= sbusburst; aprint_normal("\n"); - aprint_normal_dev(self, "nid 0x%x, bustag %p, slave-burst 0x%x\n", + aprint_normal_dev(self, "nid 0x%x, bustag %p, burst 0x%x (parent 0x%0x)\n", sc->sc_node, sc->sc_bustag, - sc->sc_burst); + sc->sc_burst, + sbsc->sc_burst); /* change blink pattern to marching 2 */ diff --git a/sbus-to-ztex-gateware/rom.vhd b/sbus-to-ztex-gateware/rom.vhd index 6816a94..bb636da 100644 --- a/sbus-to-ztex-gateware/rom.vhd +++ b/sbus-to-ztex-gateware/rom.vhd @@ -34,8 +34,8 @@ architecture arch of Prom is signal Prom_ROM : rom_type := ( -- copy/paste the ROM content here -- -"11110001000010000100001101110100", -- 1 -"00000000000000000000000100000110", -- 2 +"11110001000010000100100001000010", -- 1 +"00000000000000000000000100011100", -- 2 "00010010000011010101001001000100", -- 3 "01001111010011000010110001010011", -- 4 "01000010011101010111001101000110", -- 5 @@ -51,56 +51,60 @@ architecture arch of Prom is "00101101011000100111010101110010", -- 15 "01110011011101000010110101110011", -- 16 "01101001011110100110010101110011", -- 17 -"00000001000100001010010011000000", -- 18 -"11001010000010000110110001100101", -- 19 -"01100100001011010111011001101001", -- 20 -"01110010011101000000100000000000", -- 21 -"10111000000000010000001011001010", -- 22 -"00001111011011010111100100101101", -- 23 -"01110011011000100111010101110011", -- 24 -"00101101011000010110010001100100", -- 25 -"01110010011001010111001101110011", -- 26 -"00001000000000011011101000000001", -- 27 -"00000011110010100000110101101101", -- 28 +"00000001000100000001000000000000", -- 18 +"00000000000000000111111100000001", -- 19 +"00010001000100100000101101100010", -- 20 +"01110101011100100111001101110100", -- 21 +"00101101011100110110100101111010", -- 22 +"01100101011100110000000100010000", -- 23 +"10100100110000001011011000001000", -- 24 +"01101100011001010110010000101101", -- 25 +"01110110011010010111001001110100", -- 26 +"00001000000000001011100000000001", -- 27 +"00000010101101100000111101101101", -- 28 "01111001001011010111001101100010", -- 29 -"01110101011100110010110101110011", -- 30 -"01110000011000010110001101100101", -- 31 -"00001000000000101011101011001010", -- 32 -"00000110011011010110000101110000", -- 33 -"00101101011010010110111000001000", -- 34 -"00000011101101110001001000000110", -- 35 -"01101101011000010111000000101101", -- 36 -"01101001011011100000001000001001", -- 37 -"11000010110010100000011101101101", -- 38 -"01100001011100000010110101101111", -- 39 -"01110101011101000000100000000100", -- 40 -"10110111000100100000011101101101", -- 41 -"01100001011100000010110101101111", -- 42 -"01110101011101000000001000001001", -- 43 -"11000010110010100000101001101101", -- 44 -"01100001011100000010110101101001", -- 45 -"01101110001011010110110001100101", -- 46 -"01100100000010000000010110110111", -- 47 -"00001000000000010001000000000000", -- 48 -"00000000000000100000000000011110", -- 49 -"00001000000000100001000000000000", -- 50 -"00000000000000000000010000001000", -- 51 -"00000011110000110000100000000000", -- 52 -"11000010110010100000101101101101", -- 53 -"01100001011100000010110101101111", -- 54 -"01110101011101000010110101101100", -- 55 -"01100101011001000000100000000110", -- 56 -"10110111000010000000000000010000", -- 57 -"00000000000000000000000000000100", -- 58 -"00001000000001001100001011001010", -- 59 -"00000110011000100110110001101001", -- 60 -"01101110011010110010000100001000", -- 61 -"00000111101101110000100000000101", -- 62 -"00001000000000000111001100001000", -- 63 -"00000110110000100001000000010010", -- 64 -"01001000100001000010000100001000", -- 65 -"00000111000000000000000000000000", -- 66 - +"01110101011100110010110101100001", -- 30 +"01100100011001000111001001100101", -- 31 +"01110011011100110000100000000001", -- 32 +"10111010000000010000001110110110", -- 33 +"00001101011011010111100100101101", -- 34 +"01110011011000100111010101110011", -- 35 +"00101101011100110111000001100001", -- 36 +"01100011011001010000100000000010", -- 37 +"10111010101101100000011001101101", -- 38 +"01100001011100000010110101101001", -- 39 +"01101110000010000000001110110111", -- 40 +"00010010000001100110110101100001", -- 41 +"01110000001011010110100101101110", -- 42 +"00000010000010011100001010110110", -- 43 +"00000111011011010110000101110000", -- 44 +"00101101011011110111010101110100", -- 45 +"00001000000001001011011100010010", -- 46 +"00000111011011010110000101110000", -- 47 +"00101101011011110111010101110100", -- 48 +"00000010000010011100001010110110", -- 49 +"00001010011011010110000101110000", -- 50 +"00101101011010010110111000101101", -- 51 +"01101100011001010110010000001000", -- 52 +"00000101101101110000100000000001", -- 53 +"00010000000000000000000000000010", -- 54 +"00000000000111100000100000000010", -- 55 +"00010000000000000000000000000000", -- 56 +"00000100000010000000001111000011", -- 57 +"00001000000000001100001010110110", -- 58 +"00001011011011010110000101110000", -- 59 +"00101101011011110111010101110100", -- 60 +"00101101011011000110010101100100", -- 61 +"00001000000001101011011100001000", -- 62 +"00000000000100000000000000000000", -- 63 +"00000000000001000000100000000100", -- 64 +"11000010110010100000011001100010", -- 65 +"01101100011010010110111001101011", -- 66 +"00100001000010000000011110110111", -- 67 +"00001000000001010000100000000000", -- 68 +"01110011000010000000011011000010", -- 69 +"00010000101000000101000000001010", -- 70 +"00000101000010000000011100000000", -- 71 -- ROM then filled with zero others => (others => '0')); begin