diff options
Diffstat (limited to 'src/devices/machine/gt64xxx.h')
-rw-r--r-- | src/devices/machine/gt64xxx.h | 61 |
1 files changed, 22 insertions, 39 deletions
diff --git a/src/devices/machine/gt64xxx.h b/src/devices/machine/gt64xxx.h index ec537cf3ebe..2376cfc01cc 100644 --- a/src/devices/machine/gt64xxx.h +++ b/src/devices/machine/gt64xxx.h @@ -14,7 +14,7 @@ // Supports R4600/4650/4700/R5000 CPUs #define MCFG_GT64010_ADD(_tag, _cpu_tag, _clock, _irq_num) \ - MCFG_PCI_HOST_ADD(_tag, GT64XXX, 0x014611ab, 0x03, 0x00000000) \ + MCFG_PCI_HOST_ADD(_tag, GT64XXX, 0x11ab0146, 0x03, 0x00000000) \ downcast<gt64xxx_device *>(device)->set_cpu_tag(_cpu_tag); \ downcast<gt64xxx_device *>(device)->set_clock(_clock); \ downcast<gt64xxx_device *>(device)->set_irq_num(_irq_num); @@ -36,7 +36,7 @@ downcast<gt64xxx_device *>(device)->set_irq_info(_irq_num); #define MCFG_GT64XXX_SET_CS(_cs_num, _map) \ - downcast<gt64xxx_device *>(device)->set_cs_map(_cs_num, ADDRESS_MAP_NAME(_map), #_map, owner); + downcast<gt64xxx_device *>(device)->set_map(_cs_num, address_map_delegate(ADDRESS_MAP_NAME(_map), #_map), owner); /************************************* * @@ -166,36 +166,26 @@ #define GINT_TARABORT_SHIFT (19) #define GINT_RETRYCTR_SHIFT (20) - pre { line-height: 125%; }
td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight .c { color: #888 } /* Comment */
.highlight .err { color: #A61717; background-color: #E3D2D2 } /* Error */
.highlight .k { color: #080; font-weight: bold } /* Keyword */
.highlight .ch { color: #888 } /* Comment.Hashbang */
.highlight .cm { color: #888 } /* Comment.Multiline */
.highlight .cp { color: #C00; font-weight: bold } /* Comment.Preproc */
.highlight .cpf { color: #888 } /* Comment.PreprocFile */
.highlight .c1 { color: #888 } /* Comment.Single */
.highlight .cs { color: #C00; font-weight: bold; background-color: #FFF0F0 } /* Comment.Special */
.highlight .gd { color: #000; background-color: #FDD } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
.highlight .gr { color: #A00 } /* Generic.Error */
.highlight .gh { color: #333 } /* Generic.Heading */
.highlight .gi { color: #000; background-color: #DFD } /* Generic.Inserted */
.highlight .go { color: #888 } /* Generic.Output */
.highlight .gp { color: #555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #666 } /* Generic.Subheading */
.highlight .gt { color: #A00 } /* Generic.Traceback */
.highlight .kc { color: #080; font-weight: bold } /* Keyword.Constant */
.highlight .kd { color: #080; font-weight: bold } /* Keyword.Declaration */
.highlight .kn { color: #080; font-weight: bold } /* Keyword.Namespace */
.highlight .kp { color: #080 } /* Keyword.Pseudo */
.highlight .kr { color: #080; font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #888; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #00D; font-weight: bold } /* Literal.Number */
.highlight .s { color: #D20; background-color: #FFF0F0 } /* Literal.String */
.highlight .na { color: #369 } /* Name.Attribute */
.highlight .nb { color: #038 } /* Name.Builtin */
.highlight .nc { color: #B06; font-weight: bold } /* Name.Class */
.highlight .no { color: #036; font-weight: bold } /* Name.Constant */
.highlight .nd { color: #555 } /* Name.Decorator */
.highlight .ne { color: #B06; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #06B; font-weight: bold } /* Name.Function */
.highlight .nl { color: #369; font-style: italic } /* Name.Label */
.highlight .nn { color: #B06; font-weight: bold } /* Name.Namespace */
.highlight .py { color: #369; font-weight: bold } /* Name.Property */
.highlight .nt { color: #B06; font-weight: bold } /* Name.Tag */
.highlight .nv { color: #369 } /* Name.Variable */
.highlight .ow { color: #080 } /* Operator.Word */
.highlight .w { color: #BBB } /* Text.Whitespace */
.highlight .mb { color: #00D; font-weight: bold } /* Literal.Number.Bin */
.highlight .mf { color: #00D; font-weight: bold } /* Literal.Number.Float */
.highlight .mh { color: #00D; font-weight: bold } /* Literal.Number.Hex */
.highlight .mi { color: #00D; font-weight: bold } /* Literal.Number.Integer */
.highlight .mo { color: #00D; font-weight: bold } /* Literal.Number.Oct */
.highlight .sa { color: #D20; background-color: #FFF0F0 } /* Literal.String.Affix */
.highlight .sb { color: #D20; background-color: #FFF0F0 } /* Literal.String.Backtick */
.highlight .sc { color: #D20; background-color: #FFF0F0 } /* Literal.String.Char */
.highlight .dl { color: #D20; background-color: #FFF0F0 } /* Literal.String.Delimiter */
.highlight .sd { color: #D20; background-color: #FFF0F0 } /* Literal.String.Doc */
.highlight .s2 { color: #D20; background-color: #FFF0F0 } /* Literal.String.Double */
.highlight .se { color: #04D; background-color: #FFF0F0 } /* Literal.String.Escape */
.highlight .sh { color: #D20; background-color: #FFF0F0 } /* Literal.String.Heredoc */
.highlight .si { color: #33B; background-color: #FFF0F0 } /* Literal.String.Interpol */
.highlight .sx { color: #2B2; background-color: #F0FFF0 } /* Literal.String.Other */
.highlight .sr { color: #080; background-color: #FFF0FF } /* Literal.String.Regex */
.highlight .s1 { color: #D20; background-color: #FFF0F0 } /* Literal.String.Single */
.highlight .ss { color: #A60; background-color: #FFF0F0 } /* Literal.String.Symbol */
.highlight .bp { color: #038 } /* Name.Builtin.Pseudo */
.highlight .fm { color: #06B; font-weight: bold } /* Name.Function.Magic */
.highlight .vc { color: #369 } /* Name.Variable.Class */
.highlight .vg { color: #D70 } /* Name.Variable.Global */
.highlight .vi { color: #33B } /* Name.Variable.Instance */
.highlight .vm { color: #369 } /* Name.Variable.Magic */
.highlight .il { color: #00D; font-weight: bold } /* Literal.Number.Integer.Long */ return require('lib/tap')(function (test)
test("basic tcp server and client", function (print, p, expect, uv)
local server = uv.new_tcp()
uv.tcp_bind(server, "::", 0)
uv.listen(server, 128, expect(function (err)
p("server on connection", server)
assert(not err, err)
uv.close(server)
end))
local address = uv.tcp_getsockname(server)
p{server=server,address=address}
local client = uv.new_tcp()
local req = uv.tcp_connect(client, "::1", address.port, expect(function (err)
p("client on connect", client, err)
assert(not err, err)
uv.shutdown(client, expect(function (err)
p("client on shutdown", client, err)
assert(not err, err)
uv.close(client, expect(function ()
p("client on close", client)
end))
end))
end))
p{client=client,req=req}
end)
test("tcp echo server and client", function (print, p, expect, uv)
local server = uv.new_tcp()
assert(uv.tcp_bind(server, "127.0.0.1", 0))
assert(uv.listen(server, 1, expect(function ()
local client = uv.new_tcp()
assert(uv.accept(server, client))
assert(uv.read_start(client, expect(function (err, data)
p("server read", {err=err,data=data})
assert(not err, err)
if data then
assert(uv.write(client, data))
else
assert(uv.read_stop(client))
uv.close(client)
uv.close(server)
end
end, 2)))
end)))
local address = uv.tcp_getsockname(server)
p{server=server,address=address}
local socket = assert(uv.new_tcp())
assert(uv.tcp_connect(socket, "127.0.0.1", address.port, expect(function ()
assert(uv.read_start(socket, expect(function (err, data)
p("client read", {err=err,data=data})
assert(not err, err)
assert(uv.read_stop(socket))
uv.close(socket)
end)))
local req = assert(uv.write(socket, "Hello", function (err)
p("client onwrite", socket, err)
assert(not err, err)
end))
p{socket=socket,req=req}
end)))
end)
test("tcp echo server and client with methods", function (print, p, expect, uv)
local server = uv.new_tcp()
assert(server:bind("127.0.0.1", 0))
assert(server:listen(1, expect(function ()
local client = uv.new_tcp()
assert(server:accept(client))
assert(client:read_start(expect(function (err, data)
p("server read", {err=err,data=data})
assert(not err, err)
if data then
assert(client:write(data))
else
assert(client:read_stop())
client:close()
server:close()
end
end, 2)))
end)))
local address = server:getsockname()
p{server=server,address=address}
local socket = assert(uv.new_tcp())
assert(socket:connect("127.0.0.1", address.port, expect(function ()
assert(socket:read_start(expect(function (err, data)
p("client read", {err=err,data=data})
assert(not err, err)
assert(socket:read_stop())
socket:close()
end)))
local req = assert(socket:write("Hello", function (err)
p("client onwrite", socket, err)
assert(not err, err)
end))
p{socket=socket,req=req}
end)))
end)
test("tcp invalid ip address", function (print, p, expect, uv)
local ip = '127.0.0.100005'
local server = uv.new_tcp()
local status, err = pcall(function() uv.tcp_bind(server, ip, 1000) end)
assert(not status)
p(err)
assert(err:find(ip))
uv.close(server)
end)
end)
|