Changeset 1b11576d in mainline for uspace/lib


Ignore:
Timestamp:
2010-10-23T16:04:12Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c77b4d6
Parents:
84c20da (diff), 58b833c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
uspace/lib
Files:
21 added
12 deleted
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/Makefile

    r84c20da r1b11576d  
    5757        generic/clipboard.c \
    5858        generic/devmap.c \
     59        generic/devman.c \
     60        generic/device/hw_res.c \
     61        generic/device/char.c \
    5962        generic/event.c \
    6063        generic/errno.c \

  • uspace/lib/c/generic/adt/dynamic_fifo.c

    r84c20da r1b11576d  
    2828
    2929/** @addtogroup libc
    30  *  @{
     30 * @{
    3131 */
    3232
    … …  
    3434 * Dynamic first in first out positive integer queue implementation.
    3535 */
     36
     37#include <adt/dynamic_fifo.h>
    3638
    3739#include <errno.h>
    3840#include <malloc.h>
    3941#include <mem.h>
    40 
    41 #include <adt/dynamic_fifo.h>
    4242
    4343/** Internal magic value for a consistency check. */
    … …  
    106106int dyn_fifo_push(dyn_fifo_ref fifo, int value, int max_size)
    107107{
    108         int * new_items;
     108        int *new_items;
    109109
    110110        if (!dyn_fifo_is_valid(fifo))
    … …  
    149149/** Returns and excludes the first item in the queue.
    150150 *
    151  * @param[in,out] fifoi The dynamic queue.
     151 * @param[in,out] fifo  The dynamic queue.
    152152 * @returns             Value of the first item in the queue.
    153153 * @returns             EINVAL if the queue is not valid.
    … …  
    189189/** Clears and destroys the queue.
    190190 *
    191  *  @param[in,out] fifo         The dynamic queue.
    192  *  @returns                    EOK on success.
    193  *  @returns                    EINVAL if the queue is not valid.
     191 * @param[in,out] fifo  The dynamic queue.
     192 * @returns             EOK on success.
     193 * @returns             EINVAL if the queue is not valid.
    194194 */
    195195int dyn_fifo_destroy(dyn_fifo_ref fifo)

  • uspace/lib/c/generic/ddi.c

    r84c20da r1b11576d  
    9696}
    9797
     98/** Enable an interrupt.
     99 *
     100 * @param irq the interrupt.
     101 *
     102 * @return Zero on success, negative error code otherwise.
     103 */
     104int interrupt_enable(int irq)
     105{
     106        return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 1);
     107}
     108
     109/** Disable an interrupt.
     110 *
     111 * @param irq the interrupt.
     112 *
     113 * @return Zero on success, negative error code otherwise.
     114 */
     115int interrupt_disable(int irq)
     116{
     117        return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 0);
     118}
     119
    98120/** Enable PIO for specified I/O range.
    99121 *

  • uspace/lib/c/include/ddi.h

    r84c20da r1b11576d  
    4242extern int iospace_enable(task_id_t, void *, unsigned long);
    4343extern int pio_enable(void *, size_t, void **);
     44extern int interrupt_enable(int);
     45extern int interrupt_disable(int);
    4446
    4547#endif

  • uspace/lib/c/include/ipc/services.h

    r84c20da r1b11576d  
    4545        SERVICE_VFS,
    4646        SERVICE_DEVMAP,
     47        SERVICE_DEVMAN,
    4748        SERVICE_FHC,
    4849        SERVICE_OBIO,

  • uspace/lib/drv/Makefile

    r84c20da r1b11576d  
    2828#
    2929
    30 USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBPCI_PREFIX)/libpci.a
    32 EXTRA_CFLAGS = -I$(LIBPCI_PREFIX)
    33 BINARY = pci
     30USPACE_PREFIX = ../..
     31EXTRA_CFLAGS = -Iinclude
     32LIBRARY = libdrv
    3433
    3534SOURCES = \
    36         pci.c
     35        generic/driver.c \
     36        generic/dev_iface.c \
     37        generic/remote_res.c \
     38        generic/remote_char.c
    3739
    3840include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.