Changeset 46c20c8 in mainline for uspace/srv/net/il/ip/ip_module.h


Ignore:
Timestamp:
2010-11-26T20:08:10Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
45df59a
Parents:
fb150d78 (diff), ffdd2b9 (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.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/il/ip/ip_module.h

    rfb150d78 r46c20c8  
    11/*
    2  * Copyright (c) 2006 Martin Decky
     2 * Copyright (c) 2009 Lukas Mejdrech
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup ppc32
     29/** @addtogroup ip
    3030 * @{
    3131 */
     32
    3233/** @file
     34 * IP module functions.
     35 * The functions are used as IP module entry points.
    3336 */
    3437
    35 #ifndef KERN_ppc32_CPUID_H_
    36 #define KERN_ppc32_CPUID_H_
     38#ifndef NET_IP_MODULE_H_
     39#define NET_IP_MODULE_H_
    3740
    38 #include <arch/types.h>
     41#include <ipc/ipc.h>
    3942
    40 typedef struct {
    41         uint16_t version;
    42         uint16_t revision;
    43 } __attribute__ ((packed)) cpu_info_t;
    44 
    45 static inline void cpu_version(cpu_info_t *info)
    46 {
    47         asm volatile (
    48                 "mfpvr %0\n"
    49                 : "=r" (*info)
    50         );
    51 }
     43extern int ip_initialize(async_client_conn_t);
     44extern int ip_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
     45    int *);
    5246
    5347#endif
Note: See TracChangeset for help on using the changeset viewer.