Changeset 476f62c in mainline for uspace/srv


Ignore:
Timestamp:
2014-01-17T17:26:48Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5828554, cf982ff
Parents:
61b5b73d (diff), 66be0288 (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 libdrv cleanup.

  • move 'client side' device iface to libdrv (from libc)
  • hide remote_* libdrv headers
  • add a bunch of const qualifiers and change static data to const
  • cleanup: index initialized arrays, array size macro, removes duplicit enums, …

TODO

move hw_res, pio_window and co to libdrv. (too entangled with libc to move right now)
move clock_dev iface to libdrv. (also tied to libc, we need a time provider solution)

Location:
uspace/srv
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/bd/sata_bd/Makefile

    r61b5b73d r476f62c  
    2929USPACE_PREFIX = ../../..
    3030BINARY = sata_bd
     31EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
     32LIBS = $(LIBDRV_PREFIX)/libdrv.a
    3133
    3234SOURCES = \

  • uspace/srv/bd/sata_bd/sata_bd.c

    r61b5b73d r476f62c  
    3939#include <sys/types.h>
    4040#include <bd_srv.h>
     41#include <devman.h>
    4142#include <errno.h>
    4243#include <stdio.h>
    … …  
    4546#include <macros.h>
    4647
    47 #include <device/ahci.h>
     48#include <ahci_iface.h>
    4849#include "sata_bd.h"
    4950

  • uspace/srv/hid/compositor/Makefile

    r61b5b73d r476f62c  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRAW_PREFIX)/libdraw.a $(LIBSOFTREND_PREFIX)/libsoftrend.a \
    31         $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    32 EXTRA_CFLAGS += -I$(LIBDRAW_PREFIX) -I$(LIBSOFTREND_PREFIX)
     30LIBS = \
     31        $(LIBDRAW_PREFIX)/libdraw.a \
     32        $(LIBSOFTREND_PREFIX)/libsoftrend.a \
     33        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
     34        $(LIBDRV_PREFIX)/libdrv.a
     35
     36EXTRA_CFLAGS += \
     37        -I$(LIBDRAW_PREFIX) \
     38        -I$(LIBSOFTREND_PREFIX) \
     39        -I$(LIBDRV_PREFIX)/include
     40
    3341BINARY = compositor
    3442

  • uspace/srv/hid/compositor/compositor.c

    r61b5b73d r476f62c  
    5858
    5959#include <event.h>
    60 #include <device/graph_dev.h>
     60#include <graph_iface.h>
    6161#include <io/keycode.h>
    6262#include <io/mode.h>

  • uspace/srv/hid/isdv4_tablet/Makefile

    r61b5b73d r476f62c  
    2828
    2929USPACE_PREFIX = ../../..
    30 #LIBS =
    31 #EXTRA_CFLAGS =
     30LIBS = $(LIBDRV_PREFIX)/libdrv.a
     31EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
    3232BINARY = isdv4_tablet
    3333

  • uspace/srv/hid/isdv4_tablet/isdv4.c

    r61b5b73d r476f62c  
    2727 */
    2828
    29 #include <device/char_dev.h>
     29#include <char_dev_iface.h>
    3030#include <errno.h>
    3131#include <stdlib.h>

  • uspace/srv/hid/isdv4_tablet/main.c

    r61b5b73d r476f62c  
    2727 */
    2828
    29 #include <device/char_dev.h>
     29#include <char_dev_iface.h>
    3030#include <errno.h>
    3131#include <ipc/serial_ctl.h>

  • uspace/srv/net/ethip/Makefile

    r61b5b73d r476f62c  
    2929USPACE_PREFIX = ../../..
    3030BINARY = ethip
     31EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
     32LIBS = $(LIBDRV_PREFIX)/libdrv.a
    3133
    3234SOURCES = \

  • uspace/srv/net/ethip/ethip_nic.c

    r61b5b73d r476f62c  
    4343#include <io/log.h>
    4444#include <loc.h>
    45 #include <device/nic.h>
     45#include <nic_iface.h>
    4646#include <stdlib.h>
    4747#include <mem.h>

  • uspace/srv/net/slip/Makefile

    r61b5b73d r476f62c  
    2929USPACE_PREFIX = ../../..
    3030BINARY = slip
    31 
     31LIBS = $(LIBDRV_PREFIX)/libdrv.a
     32EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
    3233SOURCES = \
    3334        slip.c

  • uspace/srv/net/slip/slip.c

    r61b5b73d r476f62c  
    4040#include <inet/addr.h>
    4141#include <inet/iplink_srv.h>
    42 #include <device/char_dev.h>
     42#include <char_dev_iface.h>
    4343#include <io/log.h>
    4444#include <errno.h>
Note: See TracChangeset for help on using the changeset viewer.