1.1 --- a/conf/landfall-examples/mips-ci20-common.io Fri Nov 10 22:30:39 2023 +0100
1.2 +++ b/conf/landfall-examples/mips-ci20-common.io Sun Nov 12 01:05:16 2023 +0100
1.3 @@ -4,22 +4,16 @@
1.4
1.5 local hw = Io.system_bus()
1.6
1.7 -Io.add_vbus("cpm", Io.Vi.System_bus
1.8 +local bus = Io.Vi.System_bus
1.9 {
1.10 + AIC = wrap(hw:match("jz4780-aic"));
1.11 CPM = wrap(hw:match("jz4780-cpm"));
1.12 -})
1.13 -
1.14 -Io.add_vbus("gpio", Io.Vi.System_bus
1.15 -{
1.16 + DMA = wrap(hw:match("jz4780-dma"));
1.17 GPIO = wrap(hw:match("jz4780-gpio"));
1.18 -})
1.19 + LCD = wrap(hw:match("jz4780-lcd"));
1.20 + HDMI = wrap(hw:match("jz4780-hdmi"));
1.21 + I2C = wrap(hw:match("jz4780-i2c"));
1.22 + SSI = wrap(hw:match("jz4780-ssi"));
1.23 +}
1.24
1.25 -Io.add_vbus("lcd", Io.Vi.System_bus
1.26 -{
1.27 - LCD = wrap(hw:match("jz4780-lcd"));
1.28 -})
1.29 -
1.30 -Io.add_vbus("hdmi", Io.Vi.System_bus
1.31 -{
1.32 - HDMI = wrap(hw:match("jz4780-hdmi"));
1.33 -})
1.34 +Io.add_vbus("common", bus)
2.1 --- a/conf/landfall-examples/mips-ci20-fbdrv.cfg Fri Nov 10 22:30:39 2023 +0100
2.2 +++ b/conf/landfall-examples/mips-ci20-fbdrv.cfg Sun Nov 12 01:05:16 2023 +0100
2.3 @@ -10,19 +10,12 @@
2.4 -- Define general access to peripherals.
2.5
2.6 local io_buses = {
2.7 - cpm = l:new_channel();
2.8 - gpio = l:new_channel();
2.9 - hdmi = l:new_channel();
2.10 - lcd = l:new_channel();
2.11 + common = l:new_channel();
2.12 };
2.13
2.14 l:start({
2.15 caps = {
2.16 - cpm = io_buses.cpm:svr(),
2.17 - gpio = io_buses.gpio:svr(),
2.18 - hdmi = io_buses.hdmi:svr(),
2.19 - lcd = io_buses.lcd:svr(),
2.20 -
2.21 + common = io_buses.common:svr(),
2.22 icu = L4.Env.icu,
2.23 sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
2.24 },
2.25 @@ -35,7 +28,7 @@
2.26
2.27 l:start({
2.28 caps = {
2.29 - vbus = io_buses.cpm,
2.30 + vbus = io_buses.common,
2.31 cpm = cpm:svr(),
2.32 },
2.33 },
2.34 @@ -50,7 +43,7 @@
2.35 cpm = cpm,
2.36 display = display:svr(),
2.37 icu = L4.Env.icu,
2.38 - vbus = io_buses.hdmi, -- for HDMI resource access
2.39 + vbus = io_buses.common, -- for HDMI resource access
2.40 },
2.41 },
2.42 "rom/dev_display_ci20_hdmi");
2.43 @@ -61,7 +54,7 @@
2.44
2.45 l:start({
2.46 caps = {
2.47 - vbus = io_buses.lcd,
2.48 + vbus = io_buses.common,
2.49 fb = fbdrv_fb:svr(),
2.50 cpm = cpm,
2.51 display = display, -- needed by LCD driver
3.1 --- a/conf/landfall-examples/mips-ci20-fbterminal.cfg Fri Nov 10 22:30:39 2023 +0100
3.2 +++ b/conf/landfall-examples/mips-ci20-fbterminal.cfg Sun Nov 12 01:05:16 2023 +0100
3.3 @@ -11,19 +11,12 @@
3.4 -- Define general access to peripherals.
3.5
3.6 local io_buses = {
3.7 - cpm = l:new_channel();
3.8 - gpio = l:new_channel();
3.9 - hdmi = l:new_channel();
3.10 - lcd = l:new_channel();
3.11 + common = l:new_channel();
3.12 };
3.13
3.14 l:start({
3.15 caps = {
3.16 - cpm = io_buses.cpm:svr(),
3.17 - gpio = io_buses.gpio:svr(),
3.18 - hdmi = io_buses.hdmi:svr(),
3.19 - lcd = io_buses.lcd:svr(),
3.20 -
3.21 + common = io_buses.common:svr(),
3.22 icu = L4.Env.icu,
3.23 sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
3.24 },
3.25 @@ -36,7 +29,7 @@
3.26
3.27 l:start({
3.28 caps = {
3.29 - vbus = io_buses.cpm,
3.30 + vbus = io_buses.common,
3.31 cpm = cpm:svr(),
3.32 },
3.33 },
3.34 @@ -51,7 +44,7 @@
3.35 cpm = cpm,
3.36 display = display:svr(),
3.37 icu = L4.Env.icu,
3.38 - vbus = io_buses.hdmi, -- for HDMI resource access
3.39 + vbus = io_buses.common, -- for HDMI resource access
3.40 },
3.41 },
3.42 "rom/dev_display_ci20_hdmi");
3.43 @@ -62,7 +55,7 @@
3.44
3.45 l:start({
3.46 caps = {
3.47 - vbus = io_buses.lcd,
3.48 + vbus = io_buses.common,
3.49 fb = fbdrv_fb:svr(),
3.50 cpm = cpm,
3.51 display = display, -- needed by LCD driver
3.52 @@ -79,7 +72,7 @@
3.53
3.54 l:start({
3.55 caps = {
3.56 - vbus = io_buses.gpio, -- needed by input driver
3.57 + vbus = io_buses.common, -- needed by input driver
3.58 fb = fbdrv_fb,
3.59 mag = mag_caps.mag:svr(),
3.60 svc = mag_caps.svc:svr(),
4.1 --- a/conf/landfall-examples/mips-ci20-spectrum.cfg Fri Nov 10 22:30:39 2023 +0100
4.2 +++ b/conf/landfall-examples/mips-ci20-spectrum.cfg Sun Nov 12 01:05:16 2023 +0100
4.3 @@ -11,19 +11,12 @@
4.4 -- Define general access to peripherals.
4.5
4.6 local io_buses = {
4.7 - cpm = l:new_channel();
4.8 - gpio = l:new_channel();
4.9 - hdmi = l:new_channel();
4.10 - lcd = l:new_channel();
4.11 + common = l:new_channel();
4.12 };
4.13
4.14 l:start({
4.15 caps = {
4.16 - cpm = io_buses.cpm:svr(),
4.17 - gpio = io_buses.gpio:svr(),
4.18 - hdmi = io_buses.hdmi:svr(),
4.19 - lcd = io_buses.lcd:svr(),
4.20 -
4.21 + common = io_buses.common:svr(),
4.22 icu = L4.Env.icu,
4.23 sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
4.24 },
4.25 @@ -36,7 +29,7 @@
4.26
4.27 l:start({
4.28 caps = {
4.29 - vbus = io_buses.cpm,
4.30 + vbus = io_buses.common,
4.31 cpm = cpm:svr(),
4.32 },
4.33 },
4.34 @@ -51,7 +44,7 @@
4.35 cpm = cpm,
4.36 display = display:svr(),
4.37 icu = L4.Env.icu,
4.38 - vbus = io_buses.hdmi, -- for HDMI resource access
4.39 + vbus = io_buses.common, -- for HDMI resource access
4.40 },
4.41 },
4.42 "rom/dev_display_ci20_hdmi");
4.43 @@ -62,7 +55,7 @@
4.44
4.45 l:start({
4.46 caps = {
4.47 - vbus = io_buses.lcd,
4.48 + vbus = io_buses.common,
4.49 fb = fbdrv_fb:svr(),
4.50 cpm = cpm,
4.51 display = display, -- needed by LCD driver
4.52 @@ -79,7 +72,7 @@
4.53
4.54 l:start({
4.55 caps = {
4.56 - vbus = io_buses.gpio, -- needed by input driver
4.57 + vbus = io_buses.common, -- needed by input driver
4.58 fb = fbdrv_fb,
4.59 mag = mag_caps.mag:svr(),
4.60 svc = mag_caps.svc:svr(),