update

[l4.git] / l4 / pkg / libvbus / lib / src / vbus.cc

diff --git a/l4/pkg/libvbus/lib/src/vbus.cc b/l4/pkg/libvbus/lib/src/vbus.cc
index 4aaf3f1990778c4e6fff281afad256fd8d038334..5bc4923fbc6ccb4a7ec8424b2386509ffbfc73b7 100644 (file)
--- a/l4/pkg/libvbus/lib/src/vbus.cc
+++ b/l4/pkg/libvbus/lib/src/vbus.cc
@@ -19,7 +19,7 @@ l4vbus_get_device_by_hid(l4_cap_idx_t vbus, l4vbus_device_handle_t parent,
                          l4vbus_device_handle_t *child, char const *hid,
                          int depth, l4vbus_device_t *devinfo)
 {
-  L4::Ipc_iostream s(l4_utcb());
+  L4::Ipc::Iostream s(l4_utcb());
   s << parent << l4_uint32_t(L4vbus_vdevice_get_by_hid) << *child << depth
     << hid;
   int err = l4_error(s.call(vbus));
@@ -42,7 +42,7 @@ l4vbus_get_next_device(l4_cap_idx_t vbus, l4vbus_device_handle_t parent,
                        l4vbus_device_handle_t *child, int depth,
                        l4vbus_device_t *devinfo)
 {
-  L4::Ipc_iostream s(l4_utcb());
+  L4::Ipc::Iostream s(l4_utcb());
   s << parent << l4_uint32_t(L4vbus_vdevice_get_next) << *child << depth;
   int err = l4_error(s.call(vbus));
   if (err < 0)
@@ -60,7 +60,7 @@ int
 l4vbus_get_resource(l4_cap_idx_t vbus, l4vbus_device_handle_t dev,
                     int res_idx, l4vbus_resource_t *res)
 {
-  L4::Ipc_iostream s(l4_utcb());
+  L4::Ipc::Iostream s(l4_utcb());
   s << dev << l4_uint32_t(L4vbus_vdevice_get_resource) << res_idx;
   int err = l4_error(s.call(vbus));
   if (err < 0)
@@ -82,11 +82,11 @@ __vbus_request_port(l4_cap_idx_t vbus, l4vbus_resource_t const &res)
       l4_uint16_t log2_size = l4util_splitlog2_size(r.start, res.end);
       r.end = r.start + (1UL << log2_size) -1;
 
-      L4::Ipc_iostream s(l4_utcb());
+      L4::Ipc::Iostream s(l4_utcb());
       s << l4vbus_device_handle_t(0)
         << L4::Opcode(L4vbus_vbus_request_resource);
       s.put(r);
-      s << L4::Rcv_fpage::io(r.start, log2_size, 0);
+      s << L4::Ipc::Rcv_fpage::io(r.start, log2_size, 0);
 
       long err= l4_error(s.call(vbus));
       if (err < 0)
@@ -109,7 +109,7 @@ l4vbus_request_resource(l4_cap_idx_t vbus, l4vbus_resource_t *res,
 int
 l4vbus_release_resource(l4_cap_idx_t vbus, l4vbus_resource_t *res)
 {
-  L4::Ipc_iostream s(l4_utcb());
+  L4::Ipc::Iostream s(l4_utcb());
   s << l4vbus_device_handle_t(0)
     << l4_uint32_t(L4vbus_vbus_release_resource) << res->type << res->start
     << res->end;
@@ -122,9 +122,9 @@ int
 l4vbus_vicu_get_cap(l4_cap_idx_t vbus, l4vbus_device_handle_t icu,
                     l4_cap_idx_t res)
 {
-  L4::Ipc_iostream s(l4_utcb());
+  L4::Ipc::Iostream s(l4_utcb());
   s << icu << l4_uint32_t(L4vbus_vicu_get_cap);
-  s << L4::Small_buf(res);
+  s << L4::Ipc::Small_buf(res);
   int err = l4_error(s.call(vbus));
 
   return err;