Changeset bfd7aac in mainline for uspace


Ignore:
Timestamp:
2010-02-17T19:19:08Z (16 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1e2e0c1e
Parents:
01a9ef5 (diff), b8da2a3 (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
Files:
27 added
32 edited
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r01a9ef5 rbfd7aac  
    6060        srv/fs/devfs \
    6161        srv/hid/adb_mouse \
    62         srv/hid/console \
    6362        srv/hid/char_mouse \
    6463        srv/hid/fb \
    … …  
    6665        srv/hw/char/i8042 \
    6766        srv/net
     67
     68ifneq ($(UARCH),abs32le)
     69        DIRS += srv/hid/console
     70endif
    6871
    6972ifeq ($(UARCH),amd64)

  • uspace/app/taskdump/taskdump.c

    r01a9ef5 rbfd7aac  
    5454#define LINE_BYTES 16
    5555
    56 #define DBUF_SIZE 4096
    57 static uint8_t data_buf[DBUF_SIZE];
    58 
    5956static int phoneid;
    6057static task_id_t task_id;
    … …  
    7067static int thread_dump(uintptr_t thash);
    7168static int areas_dump(void);
    72 static int area_dump(as_area_info_t *area);
    73 static void hex_dump(uintptr_t addr, void *buffer, size_t size);
    7469static int td_read_uintptr(void *arg, uintptr_t addr, uintptr_t *value);
    7570
    … …  
    356351}
    357352
    358 static __attribute__((unused)) int area_dump(as_area_info_t *area)
    359 {
    360         size_t to_copy;
    361         size_t total;
    362         uintptr_t addr;
    363         int rc;
    364 
    365         addr = area->start_addr;
    366         total = 0;
    367 
    368         while (total < area->size) {
    369                 to_copy = min(area->size - total, DBUF_SIZE);
    370                 rc = udebug_mem_read(phoneid, data_buf, addr, to_copy);
    371                 if (rc < 0) {
    372                         printf("udebug_mem_read() failed.\n");
    373                         return rc;
    374                 }
    375 
    376                 hex_dump(addr, data_buf, to_copy);
    377 
    378                 addr += to_copy;
    379                 total += to_copy;
    380         }
    381 
    382         return EOK;
    383 }
    384 
    385 static void hex_dump(uintptr_t addr, void *buffer, size_t size)
    386 {
    387         uint8_t *data = (uint8_t *) buffer;
    388         uint8_t b;
    389         size_t pos, i;
    390 
    391         assert(addr % LINE_BYTES == 0);
    392         assert(size % LINE_BYTES == 0);
    393 
    394         pos = 0;
    395 
    396         while (pos < size) {
    397                 printf("%08lx:", addr + pos);
    398                 for (i = 0; i < LINE_BYTES; ++i) {
    399                         if (i % 4 == 0) putchar(' ');
    400                         printf(" %02x", data[pos + i]);
    401                 }
    402                 putchar('\t');
    403 
    404                 for (i = 0; i < LINE_BYTES; ++i) {
    405                         b = data[pos + i];
    406                         if (b >= 32 && b < 127) {
    407                                 putchar(b);
    408                         } else {
    409                                 putchar(' ');
    410                         }
    411                 }
    412                 putchar('\n');
    413                 pos += LINE_BYTES;
    414         }
    415 }
    416 
    417353static int td_read_uintptr(void *arg, uintptr_t addr, uintptr_t *value)
    418354{

  • uspace/lib/Makefile.common

    r01a9ef5 rbfd7aac  
    3333# Individual makefiles set:
    3434#
    35 #       USPACE_PREFIX   relative path to uspace/ directory
    36 #       LIBS            libraries to link with (with relative path)
    37 #       EXTRA_CFLAGS    additional flags to pass to C compiler
    38 #       JOB             job file name (like appname.job)
    39 #       OUTPUT          output binary name (like appname)
    40 #       SOURCES         list of source files
     35#   USPACE_PREFIX  relative path to uspace/ directory
     36#   LIBS           libraries to link with (with relative path)
     37#   EXTRA_CFLAGS   additional flags to pass to C compiler
     38#   JOB            job file name (like appname.job)
     39#   OUTPUT         output binary name (like appname)
     40#   SOURCES        list of source files
    4141#
    4242
    … …  
    7272        find . -name '*.o' -follow -exec rm \{\} \;
    7373
    74 build: 
     74build:
    7575
    7676-include $(DEPEND)

  • uspace/lib/libc/Makefile

    r01a9ef5 rbfd7aac  
    3131
    3232USPACE_PREFIX = $(shell pwd)/../..
    33 #LIBS = $(LIBC_PREFIX)/libc.a
    3433LIBS =
    3534
    … …  
    9190        generic/stacktrace.c
    9291
    93 ARCH_SOURCES = \
    94         arch/$(UARCH)/src/entry.s \
    95         arch/$(UARCH)/src/thread_entry.s
    96 
    9792SOURCES = \
    9893        $(GENERIC_SOURCES) \

  • uspace/lib/libc/Makefile.toolchain

    r01a9ef5 rbfd7aac  
    3030        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    3131        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    32         -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
     32        -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
    3333        -Werror-implicit-function-declaration -Werror -pipe -g -D__$(ENDIANESS)__
    3434

  • uspace/lib/libc/arch/abs32le/src/thread_entry.c

    r01a9ef5 rbfd7aac  
    11/*
    2  * Copyright (c) 2007 Martin Decky
     2 * Copyright (c) 2010 Martin Decky
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 #ifndef KERN_mips32_DORDER_H_
    30 #define KERN_mips32_DORDER_H_
     29/** @file
     30 */
    3131
    32 extern void ipi_broadcast_arch(int ipi);
     32#include <unistd.h>
     33#include <thread.h>
    3334
    34 #endif
     35void __thread_entry(void)
     36{
     37        __thread_main(NULL);
     38}
     39
     40/** @}
     41 */

  • uspace/lib/libc/arch/amd64/Makefile.inc

    r01a9ef5 rbfd7aac  
    3434TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin
    3535
    36 ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
     36ARCH_SOURCES = \
     37        arch/$(UARCH)/src/entry.s \
     38        arch/$(UARCH)/src/thread_entry.s \
     39        arch/$(UARCH)/src/syscall.S \
    3740        arch/$(UARCH)/src/fibril.S \
    3841        arch/$(UARCH)/src/tls.c \

  • uspace/lib/libc/arch/arm32/Makefile.inc

    r01a9ef5 rbfd7aac  
    3434TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32/bin
    3535
    36 ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
     36ARCH_SOURCES = \
     37        arch/$(UARCH)/src/entry.s \
     38        arch/$(UARCH)/src/thread_entry.s \
     39        arch/$(UARCH)/src/syscall.c \
    3740        arch/$(UARCH)/src/fibril.S \
    3841        arch/$(UARCH)/src/tls.c \

  • uspace/lib/libc/arch/ia32/Makefile.inc

    r01a9ef5 rbfd7aac  
    3434TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia32/bin
    3535
    36 ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
     36ARCH_SOURCES = \
     37        arch/$(UARCH)/src/entry.s \
     38        arch/$(UARCH)/src/thread_entry.s \
     39        arch/$(UARCH)/src/syscall.S \
    3740        arch/$(UARCH)/src/fibril.S \
    3841        arch/$(UARCH)/src/tls.c \

  • uspace/lib/libc/arch/ia64/Makefile.inc

    r01a9ef5 rbfd7aac  
    3333TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
    3434
    35 ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
     35ARCH_SOURCES = \
     36        arch/$(UARCH)/src/entry.s \
     37        arch/$(UARCH)/src/thread_entry.s \
     38        arch/$(UARCH)/src/syscall.S \
    3639        arch/$(UARCH)/src/fibril.S \
    3740        arch/$(UARCH)/src/tls.c \

  • uspace/lib/libc/arch/mips32/Makefile.inc

    r01a9ef5 rbfd7aac  
    3333TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32/bin
    3434
    35 ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
     35ARCH_SOURCES = \
     36        arch/$(UARCH)/src/entry.s \
     37        arch/$(UARCH)/src/thread_entry.s \
     38        arch/$(UARCH)/src/syscall.c \
    3639        arch/$(UARCH)/src/fibril.S \
    3740        arch/$(UARCH)/src/tls.c \

  • uspace/lib/libc/arch/mips32eb/Makefile.inc

    r01a9ef5 rbfd7aac  
    3333TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32eb/bin
    3434
    35 ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
     35ARCH_SOURCES = \
     36        arch/$(UARCH)/src/entry.s \
     37        arch/$(UARCH)/src/thread_entry.s \
     38        arch/$(UARCH)/src/syscall.c \
    3639        arch/$(UARCH)/src/fibril.S \
    3740        arch/$(UARCH)/src/tls.c \

  • uspace/lib/libc/arch/ppc32/Makefile.inc

    r01a9ef5 rbfd7aac  
    3333TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc32/bin
    3434
    35 ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
     35ARCH_SOURCES = \
     36        arch/$(UARCH)/src/entry.s \
     37        arch/$(UARCH)/src/thread_entry.s \
     38        arch/$(UARCH)/src/syscall.c \
    3639        arch/$(UARCH)/src/fibril.S \
    3740        arch/$(UARCH)/src/tls.c \

  • uspace/lib/libc/arch/sparc64/Makefile.inc

    r01a9ef5 rbfd7aac  
    3333TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
    3434
    35 ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \
     35ARCH_SOURCES = \
     36        arch/$(UARCH)/src/entry.s \
     37        arch/$(UARCH)/src/thread_entry.s \
     38        arch/$(UARCH)/src/fibril.S \
    3639        arch/$(UARCH)/src/tls.c \
    3740        arch/$(UARCH)/src/stacktrace.c \
    … …  
    4548BFD_NAME = elf64-sparc
    4649BFD_ARCH = sparc
     50
     51ifeq ($(PROCESSOR),us)
     52        DEFS += -DSUN4U
     53endif
     54
     55ifeq ($(PROCESSOR),us3)
     56        DEFS += -DSUN4U
     57endif
     58
     59ifeq ($(PROCESSOR),sun4v)
     60        DEFS += -DSUN4V
     61endif

  • uspace/lib/libc/arch/sparc64/include/config.h

    r01a9ef5 rbfd7aac  
    3636#define LIBC_sparc64_CONFIG_H_
    3737
     38#if defined (SUN4U)
    3839#define PAGE_WIDTH      14
     40#elif defined(SUN4V)
     41#define PAGE_WIDTH      13
     42#endif
     43
    3944#define PAGE_SIZE       (1 << PAGE_WIDTH)
    4045

  • uspace/lib/libc/arch/sparc64/src/thread_entry.s

    r01a9ef5 rbfd7aac  
    3838        # Create the first stack frame.
    3939        #
    40         save %sp, -176, %sp
    41         flushw
    42         add %g0, -0x7ff, %fp
     40
     41        #save %sp, -176, %sp
     42        #flushw
     43        #add %g0, -0x7ff, %fp
    4344
    4445        sethi %hi(_gp), %l7

  • uspace/lib/libc/generic/fibril.c

    r01a9ef5 rbfd7aac  
    211211        }
    212212       
    213         /* Avoid srcf being clobbered by context_save() */
    214         srcf = __tcb_get()->fibril_data;
    215        
    216213        /* Choose a new fibril to run */
    217214        fibril_t *dstf;

  • uspace/lib/libc/include/atomicdflt.h

    r01a9ef5 rbfd7aac  
    5656}
    5757
    58 #ifndef CAS 
     58#ifndef CAS
    5959static inline bool cas(atomic_t *val, long ov, long nv)
    6060{

  • uspace/lib/libc/include/stacktrace.h

    r01a9ef5 rbfd7aac  
    5757extern void stacktrace_prepare(void);
    5858extern uintptr_t stacktrace_fp_get(void);
    59 extern uintptr_t stacktrace_pc_get();
     59extern uintptr_t stacktrace_pc_get(void);
    6060
    6161#endif

  • uspace/srv/hid/fb/Makefile.build

    r01a9ef5 rbfd7aac  
    7272
    7373ifeq ($(UARCH),sparc64)
    74         SOURCES += sgcn.c \
    75                 serial_console.c
    76         CFLAGS += -DSGCN_ENABLED
     74        ifeq ($(PROCESSOR), sun4v)
     75                SOURCES += niagara.c \
     76                        serial_console.c
     77                CFLAGS += -DNIAGARA_ENABLED
     78        endif
     79
     80        ifeq ($(MACHINE), serengeti)
     81                SOURCES += sgcn.c \
     82                        serial_console.c
     83                CFLAGS += -DSGCN_ENABLED
     84        endif
    7785endif
    7886

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

    r01a9ef5 rbfd7aac  
    4141#include "ski.h"
    4242#include "sgcn.h"
     43#include "niagara.h"
    4344#include "main.h"
    4445
    … …  
    8889        }
    8990#endif
     91#ifdef NIAGARA_ENABLED
     92        if ((!initialized) && (sysinfo_value("fb.kind") == 5)) {
     93                if (niagara_init() == 0)
     94                        initialized = true;
     95        }
     96#endif
    9097#ifdef SKI_ENABLED
    9198        if ((!initialized) && (sysinfo_value("fb") != true)) {

  • uspace/srv/hid/kbd/Makefile.build

    r01a9ef5 rbfd7aac  
    130130
    131131ifeq ($(UARCH),sparc64)
    132         ifeq ($(MACHINE),serengeti)
     132        ifeq ($(PROCESSOR),sun4v)
    133133                SOURCES += \
    134                         port/sgcn.c \
     134                        port/niagara.c \
    135135                        ctl/stty.c
    136136        else
    137                 SOURCES += \
     137                ifeq ($(MACHINE),serengeti)
     138                        SOURCES += \
     139                                port/sgcn.c \
     140                                ctl/stty.c
     141                endif
     142                ifeq ($(MACHINE),generic)
     143                        SOURCES += \
    138144                        port/sun.c \
    139145                        port/z8530.c \
    140146                        port/ns16550.c \
    141147                        ctl/sun.c
     148                endif
    142149        endif
     150endif
     151
     152ifeq ($(UARCH),abs32le)
     153        SOURCES += \
     154                port/dummy.c \
     155                ctl/pc.c
    143156endif
    144157

  • uspace/srv/loader/include/arch.h

    r01a9ef5 rbfd7aac  
    3737#define LOADER_ARCH_H_
    3838
    39 void program_run(void *entry_point, void *pcb);
     39extern void program_run(void *entry_point, void *pcb);
    4040
    4141#endif

  • uspace/srv/net/Makefile.module

    r01a9ef5 rbfd7aac  
    3535
    3636CFLAGS += -Iinclude -I../libadt/include
     37CFLAGS += -Wno-strict-aliasing
    3738
    3839CHECK_CFLAGS = -fsyntax-only -Wextra -Wno-div-by-zero -Wsystem-headers -Wfloat-equal -Wdeclaration-after-statement -Wundef -Wno-endif-labels -Wshadow -Wlarger-than-1500 -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wmissing-field-initializers -Wmissing-noreturn -Wmissing-format-attribute -Wno-multichar -Wno-deprecated-declarations -Wpacked -Wpadded -Wredundant-decls -Wnested-externs -Wunreachable-code -Winline -Winvalid-pch -Wlong-long -Wvariadic-macros -Wdisabled-optimization -Wno-pointer-sign

  • uspace/srv/net/include/byteorder.h

    r01a9ef5 rbfd7aac  
    3939
    4040#include <byteorder.h>
    41 
    4241#include <sys/types.h>
    4342
    44 #ifdef ARCH_IS_BIG_ENDIAN
    4543
    46 // Already in the network byte order.
     44/** Converts the given short number ( 16 bit ) from the host byte order to the network byte order ( big endian ).
     45 *  @param[in] number The number in the host byte order to be converted.
     46 *  @returns The number in the network byte order.
     47 */
     48#define htons( number )         host2uint16_t_be( number )
    4749
    48         /** Converts the given short number ( 16 bit ) from the host byte order to the network byte order ( big endian ).
    49         *  @param[in] number The number in the host byte order to be converted.
    50         *  @returns The number in the network byte order.
    51         */
    52         #define htons( number )         ( number )
     50/** Converts the given long number ( 32 bit ) from the host byte order to the network byte order ( big endian ).
     51 *  @param[in] number The number in the host byte order to be converted.
     52 *  @returns The number in the network byte order.
     53 */
     54#define htonl( number )         host2uint32_t_be( number )
    5355
    54         /** Converts the given long number ( 32 bit ) from the host byte order to the network byte order ( big endian ).
    55          *  @param[in] number The number in the host byte order to be converted.
    56          *  @returns The number in the network byte order.
    57         */
    58         #define htonl( number )         ( number )
     56/** Converts the given short number ( 16 bit ) from the network byte order ( big endian ) to the host byte order.
     57 *  @param[in] number The number in the network byte order to be converted.
     58 *  @returns The number in the host byte order.
     59 */
     60#define ntohs( number )         uint16_t_be2host( number )
    5961
    60         /** Converts the given short number ( 16 bit ) from the network byte order ( big endian ) to the host byte order.
    61          *  @param[in] number The number in the network byte order to be converted.
    62          *  @returns The number in the host byte order.
    63          */
    64         #define ntohs( number )         ( number )
    65 
    66         /** Converts the given long number ( 32 bit ) from the network byte order ( big endian ) to the host byte order.
    67          *  @param[in] number The number in the network byte order to be converted.
    68          *  @returns The number in the host byte order.
    69          */
    70         #define ntohl( number )         ( number )
    71 
    72 #else
    73 
    74 // Has to be swapped.
    75 
    76         /** Converts the given short number ( 16 bit ) from the host byte order to the network byte order ( big endian ).
    77          *  @param[in] number The number in the host byte order to be converted.
    78          *  @returns The number in the network byte order.
    79          */
    80         #define htons( number )         uint16_t_byteorder_swap(( uint16_t )( number ))
    81 
    82         /** Converts the given long number ( 32 bit ) from the host byte order to the network byte order ( big endian ).
    83          *  @param[in] number The number in the host byte order to be converted.
    84          *  @returns The number in the network byte order.
    85          */
    86         #define htonl( number )         uint32_t_byteorder_swap( number )
    87 
    88         /** Converts the given short number ( 16 bit ) from the network byte order ( big endian ) to the host byte order.
    89          *  @param[in] number The number in the network byte order to be converted.
    90          *  @returns The number in the host byte order.
    91          */
    92         #define ntohs( number )         uint16_t_byteorder_swap(( uint16_t )( number ))
    93 
    94         /** Converts the given long number ( 32 bit ) from the network byte order ( big endian ) to the host byte order.
    95          *  @param[in] number The number in the network byte order to be converted.
    96          *  @returns The number in the host byte order.
    97          */
    98         #define ntohl( number )         uint32_t_byteorder_swap( number )
    99 
    100 #endif
     62/** Converts the given long number ( 32 bit ) from the network byte order ( big endian ) to the host byte order.
     63 *  @param[in] number The number in the network byte order to be converted.
     64 *  @returns The number in the host byte order.
     65 */
     66#define ntohl( number )         uint32_t_be2host( number )
    10167
    10268#endif

  • uspace/srv/net/modules.c

    r01a9ef5 rbfd7aac  
    5555
    5656int connect_to_service_timeout( services_t need, suseconds_t timeout ){
    57         int     phone;
    58         int     res;
     57        ipcarg_t phone;
     58        int res;
    5959
    6060        while( true ){
    61                 res = async_req_3_5( PHONE_NS, IPC_M_CONNECT_ME_TO, need, 0, 0, NULL, NULL, NULL, NULL, ( ipcarg_t * ) & phone );
    62                 if(( res >= 0 ) && ( phone >= 0 )){
     61                res = async_req_3_5( PHONE_NS, IPC_M_CONNECT_ME_TO, need, 0, 0, NULL, NULL, NULL, NULL, & phone );
     62                if( res >= 0 ){
    6363                        return phone;
    6464                }

  • uspace/srv/net/netif/dp8390/dp8390.h

    r01a9ef5 rbfd7aac  
    353353        port_t de_data_port;
    354354        int de_16bit;
    355         int de_ramsize;
     355        long de_ramsize;
    356356        int de_offset_page;
    357357        int de_startpage;

  • uspace/srv/net/netif/dp8390/dp8390_module.c

    r01a9ef5 rbfd7aac  
    208208}
    209209
    210 int netif_probe_message( device_id_t device_id, int irq, int io ){
     210int netif_probe_message( device_id_t device_id, int irq, uintptr_t io ){
    211211        ERROR_DECLARE;
    212212
    … …  
    280280        if( device->state != NETIF_ACTIVE ){
    281281                dep = ( dpeth_t * ) device->specific;
    282                 dp8390_cmds[ 0 ].addr = ( void * ) ( uint32_t ) ( dep->de_dp8390_port + DP_ISR );
     282                dp8390_cmds[ 0 ].addr = ( void * ) ( uintptr_t ) ( dep->de_dp8390_port + DP_ISR );
    283283                dp8390_cmds[ 2 ].addr = dp8390_cmds[ 0 ].addr;
    284284                ERROR_PROPAGATE( ipc_register_irq( dep->de_irq, device->device_id, device->device_id, & dp8390_code ));

  • uspace/srv/net/netif/dp8390/dp8390_port.h

    r01a9ef5 rbfd7aac  
    169169/** Type definition of a port.
    170170 */
    171 typedef int port_t;
     171typedef long port_t;
    172172
    173173/* dl_eth.h */
    … …  
    256256/** Type definition of the virtual addresses and lengths in bytes.
    257257 */
    258 typedef unsigned int vir_bytes;
     258typedef unsigned long vir_bytes;
    259259
    260260/** Type definition of the input/output vector.

  • uspace/srv/net/netif/lo/lo.c

    r01a9ef5 rbfd7aac  
    165165}
    166166
    167 int netif_probe_message( device_id_t device_id, int irq, int io ){
     167int netif_probe_message( device_id_t device_id, int irq, uintptr_t io ){
    168168        ERROR_DECLARE;
    169169

  • uspace/srv/net/netif/netif_module.h

    r01a9ef5 rbfd7aac  
    6060 *  @returns Other error codes as defined for the specific module message implementation.
    6161 */
    62 int     netif_probe_message( device_id_t device_id, int irq, int io );
     62int     netif_probe_message( device_id_t device_id, int irq, uintptr_t io );
    6363
    6464/** Sends the packet queue.

  • uspace/srv/net/socket/socket_client.c

    r01a9ef5 rbfd7aac  
    541541        socket_ref              new_socket;
    542542        aid_t                   message_id;
    543         int                             result;
     543        ipcarg_t                ipc_result;
     544        int                     result;
    544545        ipc_call_t              answer;
    545546
    … …  
    592593        ipc_data_read_start( socket->phone, cliaddr, * addrlen );
    593594        fibril_rwlock_write_unlock( & socket_globals.lock );
    594         async_wait_for( message_id, ( ipcarg_t * ) & result );
     595        async_wait_for( message_id, & ipc_result );
     596        result = (int) ipc_result;
    595597        if( result > 0 ){
    596598                if( result != socket_id ){
    … …  
    734736        socket_ref              socket;
    735737        aid_t                   message_id;
    736         int                             result;
     738        ipcarg_t                ipc_result;
     739        int                     result;
    737740        size_t                  fragments;
    738741        size_t *                lengths;
    … …  
    793796                }
    794797        }
    795         async_wait_for( message_id, ( ipcarg_t * ) & result );
     798        async_wait_for( message_id, & ipc_result );
     799        result = (int) ipc_result;
    796800        // if successful
    797801        if( result == EOK ){

  • uspace/srv/net/structures/packet/packet_remote.c

    r01a9ef5 rbfd7aac  
    6565        ERROR_DECLARE;
    6666
    67         unsigned int            size;
     67        ipcarg_t                        size;
    6868        packet_t                        next;
    6969
    … …  
    101101        ERROR_DECLARE;
    102102
    103         packet_id_t     packet_id;
    104         unsigned int size;
     103        ipcarg_t packet_id;
     104        ipcarg_t size;
    105105        packet_t packet;
    106106
    107         if( ERROR_OCCURRED( async_req_4_2( phone, NET_PACKET_CREATE_4, max_content, addr_len, max_prefix, max_suffix, ( ipcarg_t * ) & packet_id, & size ))){
     107        if( ERROR_OCCURRED( async_req_4_2( phone, NET_PACKET_CREATE_4, max_content, addr_len, max_prefix, max_suffix, & packet_id, & size ))){
    108108                return NULL;
    109109        }
    … …  
    120120        ERROR_DECLARE;
    121121
    122         packet_id_t     packet_id;
    123         unsigned int    size;
     122        ipcarg_t        packet_id;
     123        ipcarg_t        size;
    124124        packet_t        packet;
    125125
    126         if( ERROR_OCCURRED( async_req_1_2( phone, NET_PACKET_CREATE_1, content, ( ipcarg_t * ) & packet_id, & size ))){
     126        if( ERROR_OCCURRED( async_req_1_2( phone, NET_PACKET_CREATE_1, content, & packet_id, & size ))){
    127127                return NULL;
    128128        }
Note: See TracChangeset for help on using the changeset viewer.