Style: Updated style of modified files Updated the style of various source files recently updated. These mainly being the ioports interface updates
diff --git a/libsel4vmmplatsupport/include/sel4vmmplatsupport/ioports.h b/libsel4vmmplatsupport/include/sel4vmmplatsupport/ioports.h index 99d1e7c..3149d7f 100644 --- a/libsel4vmmplatsupport/include/sel4vmmplatsupport/ioports.h +++ b/libsel4vmmplatsupport/include/sel4vmmplatsupport/ioports.h
@@ -61,7 +61,7 @@ /* Add an io port range for emulation */ ioport_entry_t *vmm_io_port_add_handler(vmm_io_port_list_t *io_list, ioport_range_t ioport_range, - ioport_interface_t ioport_interface, ioport_type_t port_type); + ioport_interface_t ioport_interface, ioport_type_t port_type); /* * From a set of registered ioports, emulate an io instruction given a current ioport access.
diff --git a/libsel4vmmplatsupport/src/drivers/virtio_net.c b/libsel4vmmplatsupport/src/drivers/virtio_net.c index 75eebda..ccfc2c6 100644 --- a/libsel4vmmplatsupport/src/drivers/virtio_net.c +++ b/libsel4vmmplatsupport/src/drivers/virtio_net.c
@@ -183,7 +183,7 @@ ZF_LOGF_IF(err, "Failed to allocate virtio net"); ioport_interface_t virtio_io_interface = {net, virtio_net_io_in, virtio_net_io_out, "VIRTIO PCI NET"}; - ioport_entry_t * io_entry = vmm_io_port_add_handler(ioport, ioport_range, virtio_io_interface, port_type); + ioport_entry_t *io_entry = vmm_io_port_add_handler(ioport, ioport_range, virtio_io_interface, port_type); if (!io_entry) { ZF_LOGE("Failed to add vmm io port handler"); return NULL; @@ -193,7 +193,7 @@ net->iobase = io_entry->range.start; vmm_pci_entry_t entry = vmm_virtio_net_pci_bar(io_entry->range.start, iobase_size_bits, interrupt_pin, interrupt_line, - emulate_bar_access); + emulate_bar_access); vmm_pci_add_entry(pci, entry, NULL); ps_io_ops_t ioops;
diff --git a/libsel4vmmplatsupport/src/ioports.c b/libsel4vmmplatsupport/src/ioports.c index d0872b0..1eb2e73 100644 --- a/libsel4vmmplatsupport/src/ioports.c +++ b/libsel4vmmplatsupport/src/ioports.c
@@ -42,7 +42,7 @@ static ioport_entry_t **search_port(vmm_io_port_list_t *io_port, unsigned int port_no) { return (ioport_entry_t **)bsearch((void *)(uintptr_t)port_no, io_port->ioports, io_port->num_ioports, - sizeof(ioport_entry_t *), io_port_compare_by_range); + sizeof(ioport_entry_t *), io_port_compare_by_range); } /* Debug helper function for port no. */ @@ -121,7 +121,8 @@ return 0; } -static int alloc_free_io_port_range(vmm_io_port_list_t *io_list, ioport_range_t *io_range) { +static int alloc_free_io_port_range(vmm_io_port_list_t *io_list, ioport_range_t *io_range) +{ uint16_t free_port_addr = io_list->alloc_addr; if (free_port_addr + io_range->size < free_port_addr) { /* Possible overflow */ @@ -133,26 +134,30 @@ return 0; } -static void free_io_port_range(vmm_io_port_list_t *io_list, ioport_range_t *io_range) { +static void free_io_port_range(vmm_io_port_list_t *io_list, ioport_range_t *io_range) +{ io_list->alloc_addr -= io_range->size; } /* Add an io port range for emulation */ -ioport_entry_t *vmm_io_port_add_handler(vmm_io_port_list_t *io_list, ioport_range_t io_range, ioport_interface_t io_interface, ioport_type_t port_type) +ioport_entry_t *vmm_io_port_add_handler(vmm_io_port_list_t *io_list, ioport_range_t io_range, + ioport_interface_t io_interface, ioport_type_t port_type) { int err; if (port_type == IOPORT_FREE) { - err = alloc_free_io_port_range(io_list, &io_range); - if (err) { + err = alloc_free_io_port_range(io_list, &io_range); + if (err) { return NULL; - } + } } ioport_entry_t *entry = calloc(1, sizeof(ioport_entry_t)); if (!entry) { free_io_port_range(io_list, &io_range); return NULL; } - *entry = (ioport_entry_t){io_range, io_interface}; + *entry = (ioport_entry_t) { + io_range, io_interface + }; err = add_io_port_range(io_list, entry); if (err) { free_io_port_range(io_list, &io_range);