Index: uspace/lib/c/include/ddi.h =================================================================== --- uspace/lib/c/include/ddi.h (revision 62fbb7ef714f1160227d2fa29a651dfab2544a5b) +++ uspace/lib/c/include/ddi.h (revision 0dd022ece56ab1e6d47f7b36ab4964c1b93482bb) @@ -130,5 +130,5 @@ } -extern int irq_register(int, int, int, irq_code_t *); +extern int irq_register(int, int, int, const irq_code_t *); extern int irq_unregister(int, int); Index: uspace/lib/c/include/device/ahci.h =================================================================== --- uspace/lib/c/include/device/ahci.h (revision 62fbb7ef714f1160227d2fa29a651dfab2544a5b) +++ (revision ) @@ -1,53 +1,0 @@ -/* - * Copyright (c) 2012 Petr Jerman - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - * @brief AHCI interface definition. - */ - -#ifndef LIBC_DEVICE_AHCI_H_ -#define LIBC_DEVICE_AHCI_H_ - -#include -#include - -extern async_sess_t* ahci_get_sess(devman_handle_t, char **); - -extern int ahci_get_sata_device_name(async_sess_t *, size_t, char *); -extern int ahci_get_num_blocks(async_sess_t *, uint64_t *); -extern int ahci_get_block_size(async_sess_t *, size_t *); -extern int ahci_read_blocks(async_sess_t *, uint64_t, size_t, void *); -extern int ahci_write_blocks(async_sess_t *, uint64_t, size_t, void *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/device/battery_dev.h =================================================================== --- uspace/lib/c/include/device/battery_dev.h (revision 62fbb7ef714f1160227d2fa29a651dfab2544a5b) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2012 Maurizio Lombardi - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_DEVICE_BATTERY_DEV_H_ -#define LIBC_DEVICE_BATTERY_DEV_H_ - -#include - -typedef enum { - BATTERY_OK, - BATTERY_LOW, - BATTERY_NOT_PRESENT, -} battery_status_t; - -typedef enum { - BATTERY_STATUS_GET = 0, - BATTERY_CHARGE_LEVEL_GET, -} battery_dev_method_t; - -extern int battery_status_get(async_sess_t *, battery_status_t *); -extern int battery_charge_level_get(async_sess_t *, int *); - -#endif - Index: uspace/lib/c/include/device/char_dev.h =================================================================== --- uspace/lib/c/include/device/char_dev.h (revision 62fbb7ef714f1160227d2fa29a651dfab2544a5b) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright (c) 2010 Lenka Trochtova - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_DEVICE_CHAR_DEV_H_ -#define LIBC_DEVICE_CHAR_DEV_H_ - -#include - -typedef enum { - CHAR_DEV_READ = 0, - CHAR_DEV_WRITE -} char_dev_method_t; - -extern ssize_t char_dev_read(async_sess_t *, void *, size_t); -extern ssize_t char_dev_write(async_sess_t *, void *, size_t); - -#endif - -/** @} - */ Index: uspace/lib/c/include/device/graph_dev.h =================================================================== --- uspace/lib/c/include/device/graph_dev.h (revision 62fbb7ef714f1160227d2fa29a651dfab2544a5b) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_DEVICE_GRAPH_DEV_H_ -#define LIBC_DEVICE_GRAPH_DEV_H_ - -#include - -typedef enum { - GRAPH_DEV_CONNECT = 0 -} graph_dev_method_t; - -extern int graph_dev_connect(async_sess_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/device/nic.h =================================================================== --- uspace/lib/c/include/device/nic.h (revision 62fbb7ef714f1160227d2fa29a651dfab2544a5b) +++ (revision ) @@ -1,159 +1,0 @@ -/* - * Copyright (c) 2010 Radim Vansa - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - /** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_DEVICE_NIC_H_ -#define LIBC_DEVICE_NIC_H_ - -#include -#include -#include - -typedef enum { - NIC_SEND_MESSAGE = 0, - NIC_CALLBACK_CREATE, - NIC_GET_STATE, - NIC_SET_STATE, - NIC_GET_ADDRESS, - NIC_SET_ADDRESS, - NIC_GET_STATS, - NIC_GET_DEVICE_INFO, - NIC_GET_CABLE_STATE, - NIC_GET_OPERATION_MODE, - NIC_SET_OPERATION_MODE, - NIC_AUTONEG_ENABLE, - NIC_AUTONEG_DISABLE, - NIC_AUTONEG_PROBE, - NIC_AUTONEG_RESTART, - NIC_GET_PAUSE, - NIC_SET_PAUSE, - NIC_UNICAST_GET_MODE, - NIC_UNICAST_SET_MODE, - NIC_MULTICAST_GET_MODE, - NIC_MULTICAST_SET_MODE, - NIC_BROADCAST_GET_MODE, - NIC_BROADCAST_SET_MODE, - NIC_DEFECTIVE_GET_MODE, - NIC_DEFECTIVE_SET_MODE, - NIC_BLOCKED_SOURCES_GET, - NIC_BLOCKED_SOURCES_SET, - NIC_VLAN_GET_MASK, - NIC_VLAN_SET_MASK, - NIC_VLAN_SET_TAG, - NIC_WOL_VIRTUE_ADD, - NIC_WOL_VIRTUE_REMOVE, - NIC_WOL_VIRTUE_PROBE, - NIC_WOL_VIRTUE_LIST, - NIC_WOL_VIRTUE_GET_CAPS, - NIC_WOL_LOAD_INFO, - NIC_OFFLOAD_PROBE, - NIC_OFFLOAD_SET, - NIC_POLL_GET_MODE, - NIC_POLL_SET_MODE, - NIC_POLL_NOW -} nic_funcs_t; - -typedef enum { - NIC_EV_ADDR_CHANGED = IPC_FIRST_USER_METHOD, - NIC_EV_RECEIVED, - NIC_EV_DEVICE_STATE -} nic_event_t; - -extern int nic_send_frame(async_sess_t *, void *, size_t); -extern int nic_callback_create(async_sess_t *, async_client_conn_t, void *); -extern int nic_get_state(async_sess_t *, nic_device_state_t *); -extern int nic_set_state(async_sess_t *, nic_device_state_t); -extern int nic_get_address(async_sess_t *, nic_address_t *); -extern int nic_set_address(async_sess_t *, const nic_address_t *); -extern int nic_get_stats(async_sess_t *, nic_device_stats_t *); -extern int nic_get_device_info(async_sess_t *, nic_device_info_t *); -extern int nic_get_cable_state(async_sess_t *, nic_cable_state_t *); - -extern int nic_get_operation_mode(async_sess_t *, int *, nic_channel_mode_t *, - nic_role_t *); -extern int nic_set_operation_mode(async_sess_t *, int, nic_channel_mode_t, - nic_role_t); -extern int nic_autoneg_enable(async_sess_t *, uint32_t); -extern int nic_autoneg_disable(async_sess_t *); -extern int nic_autoneg_probe(async_sess_t *, uint32_t *, uint32_t *, - nic_result_t *, nic_result_t *); -extern int nic_autoneg_restart(async_sess_t *); -extern int nic_get_pause(async_sess_t *, nic_result_t *, nic_result_t *, - uint16_t *); -extern int nic_set_pause(async_sess_t *, int, int, uint16_t); - -extern int nic_unicast_get_mode(async_sess_t *, nic_unicast_mode_t *, size_t, - nic_address_t *, size_t *); -extern int nic_unicast_set_mode(async_sess_t *, nic_unicast_mode_t, - const nic_address_t *, size_t); -extern int nic_multicast_get_mode(async_sess_t *, nic_multicast_mode_t *, - size_t, nic_address_t *, size_t *); -extern int nic_multicast_set_mode(async_sess_t *, nic_multicast_mode_t, - const nic_address_t *, size_t); -extern int nic_broadcast_get_mode(async_sess_t *, nic_broadcast_mode_t *); -extern int nic_broadcast_set_mode(async_sess_t *, nic_broadcast_mode_t); -extern int nic_defective_get_mode(async_sess_t *, uint32_t *); -extern int nic_defective_set_mode(async_sess_t *, uint32_t); -extern int nic_blocked_sources_get(async_sess_t *, size_t, nic_address_t *, - size_t *); -extern int nic_blocked_sources_set(async_sess_t *, const nic_address_t *, - size_t); - -extern int nic_vlan_get_mask(async_sess_t *, nic_vlan_mask_t *); -extern int nic_vlan_set_mask(async_sess_t *, const nic_vlan_mask_t *); -extern int nic_vlan_set_tag(async_sess_t *, uint16_t, bool, bool); - -extern int nic_wol_virtue_add(async_sess_t *, nic_wv_type_t, const void *, - size_t, nic_wv_id_t *); -extern int nic_wol_virtue_remove(async_sess_t *, nic_wv_id_t); -extern int nic_wol_virtue_probe(async_sess_t *, nic_wv_id_t, nic_wv_type_t *, - size_t, void *, size_t *); -extern int nic_wol_virtue_list(async_sess_t *, nic_wv_type_t, size_t, - nic_wv_id_t *, size_t *); -extern int nic_wol_virtue_get_caps(async_sess_t *, nic_wv_type_t, int *); -extern int nic_wol_load_info(async_sess_t *, nic_wv_type_t *, size_t, uint8_t *, - size_t *); - -extern int nic_offload_probe(async_sess_t *, uint32_t *, uint32_t *); -extern int nic_offload_set(async_sess_t *, uint32_t, uint32_t); - -extern int nic_poll_get_mode(async_sess_t *, nic_poll_mode_t *, - struct timeval *); -extern int nic_poll_set_mode(async_sess_t *, nic_poll_mode_t, - const struct timeval *); -extern int nic_poll_now(async_sess_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/device/pci.h =================================================================== --- uspace/lib/c/include/device/pci.h (revision 62fbb7ef714f1160227d2fa29a651dfab2544a5b) +++ (revision ) @@ -1,63 +1,0 @@ -/* - * Copyright (c) 2011 Jiri Michalec - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_DEVICE_PCI_H_ -#define LIBC_DEVICE_PCI_H_ - -#include - -#define PCI_DEVICE_ID 0x02 - -typedef enum { - IPC_M_CONFIG_SPACE_READ_8, - IPC_M_CONFIG_SPACE_READ_16, - IPC_M_CONFIG_SPACE_READ_32, - - IPC_M_CONFIG_SPACE_WRITE_8, - IPC_M_CONFIG_SPACE_WRITE_16, - IPC_M_CONFIG_SPACE_WRITE_32 -} pci_dev_iface_funcs_t; - -extern int pci_config_space_read_8(async_sess_t *, uint32_t, uint8_t *); -extern int pci_config_space_read_16(async_sess_t *, uint32_t, uint16_t *); -extern int pci_config_space_read_32(async_sess_t *, uint32_t, uint32_t *); - -extern int pci_config_space_write_8(async_sess_t *, uint32_t, uint8_t); -extern int pci_config_space_write_16(async_sess_t *, uint32_t, uint16_t); -extern int pci_config_space_write_32(async_sess_t *, uint32_t, uint32_t); - -#endif - -/** @} - */