Changeset c47e1a8 in mainline for uspace/srv/drivers/rootia32


Ignore:
Timestamp:
2010-05-21T07:50:04Z (16 years ago)
Author:
Lenka Trochtova <trochtova.lenka@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d51ee2b
Parents:
cf8cc36 (diff), 15b592b (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 (rev. 451)

Location:
uspace/srv/drivers/rootia32
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/drivers/rootia32/Makefile

    rcf8cc36 rc47e1a8  
    2727
    2828USPACE_PREFIX = ../../..
    29 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
    30 
    31 OUTPUT = rootia32
     29LIBS = $(LIBDRV_PREFIX)/libdrv.a
     30EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     31BINARY = rootia32
    3232
    3333SOURCES = \
    3434        rootia32.c
    3535
    36 include ../../Makefile.common
    37 
    38 EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/drivers/rootia32/rootia32.c

    rcf8cc36 rc47e1a8  
    4242#include <fibril_synch.h>
    4343#include <stdlib.h>
    44 #include <string.h>
     44#include <str.h>
    4545#include <ctype.h>
    4646#include <macros.h>
    … …  
    6060
    6161static int rootia32_add_device(device_t *dev);
    62 static bool rootia32_init();
     62static void root_ia32_init(void);
    6363
    6464/** The root device driver's standard operations.
Note: See TracChangeset for help on using the changeset viewer.