Changeset 612ad864 in mainline


Ignore:
Timestamp:
2011-11-12T22:29:30Z (13 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0c0f823b, fa76f81
Parents:
c6f189f7 (diff), 9b6be51 (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:

cstyle

Location:
uspace
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/drv/generic/remote_pci.c

    rc6f189f7 r612ad864  
    3232/** @file
    3333 */
     34
    3435#include <assert.h>
    3536#include <async.h>
  • uspace/lib/net/tl/tl_common.c

    rc6f189f7 r612ad864  
    158158 * @return              ENOENT if the packet dimension is not cached.
    159159 */
    160 int
    161 tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
     160int tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
    162161    nic_device_id_t device_id, size_t content)
    163162{
  • uspace/srv/hid/console/console.c

    rc6f189f7 r612ad864  
    481481                                event->c = c;
    482482                               
    483                                 /* Kernel console does not read events
     483                                /*
     484                                 * Kernel console does not read events
    484485                                 * from us, so we will redirect them
    485486                                 * to the (last) active userspace console
     
    487488                                 */
    488489                                console_t *target_console = cons_get_active_uspace();
    489 
     490                               
    490491                                prodcons_produce(&target_console->input_pc,
    491492                                    &event->link);
  • uspace/srv/net/il/arp/arp.c

    rc6f189f7 r612ad864  
    703703        length += device->addr_len;
    704704        memcpy(((uint8_t *) header) + length, target->value, target->length);
    705 
     705       
    706706        int rc = packet_set_addr(packet, device->addr, device->broadcast_addr,
    707707            device->addr_len);
  • uspace/srv/net/nil/eth/eth.c

    rc6f189f7 r612ad864  
    197197        fibril_rwlock_write_lock(&eth_globals.devices_lock);
    198198        fibril_rwlock_write_lock(&eth_globals.protos_lock);
     199       
    199200        eth_globals.net_sess = sess;
    200201        memcpy(eth_globals.broadcast_addr, "\xFF\xFF\xFF\xFF\xFF\xFF",
  • uspace/srv/net/nil/nildummy/nildummy.h

    rc6f189f7 r612ad864  
    4444#include <ipc/devman.h>
    4545#include <net/device.h>
    46 #include <adt/measured_strings.h>
    4746
    4847/** Type definition of the dummy nil global data.
Note: See TracChangeset for help on using the changeset viewer.