Changeset 081971b in mainline
- Timestamp:
- 2012-02-13T23:10:29Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 87e5658c
- Parents:
- 2ff150e
- Location:
- uspace
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/nic/ne2k/dp8390.c
r2ff150e r081971b 410 410 ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); 411 411 412 printf("ne2k_send()\n"); 412 413 assert(ne2k->probed); 413 414 assert(ne2k->up); … … 421 422 if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) { 422 423 fibril_mutex_unlock(&ne2k->sq_mutex); 424 printf("ne2k_send() - checks failed size=%zu (min %zu, max %zu)\n", 425 size, ETH_MIN_PACK_SIZE, ETH_MAX_PACK_SIZE_TAGGED); 423 426 return; 424 427 } 428 429 printf("ne2k_send() - uploading\n"); 430 size_t i; 431 for (i = 0; i < size; i++) 432 printf("%02x ", ((uint8_t *)data)[i]); 433 printf("\n"); 425 434 426 435 /* Upload the frame to the ethernet card */ -
uspace/srv/ethip/ethip.c
r2ff150e r081971b 172 172 173 173 frame.dest.addr = 0xdeeedeeedeee; 174 frame.src.addr = 0xaa feedfaceee;174 frame.src.addr = 0xaadeadbeeffe; 175 175 frame.etype_len = ETYPE_IP; 176 176 frame.data = sdu->data; -
uspace/srv/ethip/pdu.c
r2ff150e r081971b 38 38 #include <errno.h> 39 39 #include <io/log.h> 40 #include <macros.h> 40 41 #include <mem.h> 41 42 #include <stdlib.h> … … 57 58 eth_header_t *hdr; 58 59 59 size = sizeof(eth_header_t) + frame->size;60 size = max(sizeof(eth_header_t) + frame->size, ETH_FRAME_MIN_SIZE); 60 61 61 62 data = calloc(size, 1); … … 122 123 123 124 val = addr->addr; 124 for (i = 0; i < MAC48_BYTES; i++) {125 for (i = 0; i < MAC48_BYTES; i++) 125 126 bbuf[i] = (val >> (8 * (MAC48_BYTES - i - 1))) & 0xff; 126 val = val >> 8;127 }128 127 } 129 128 -
uspace/srv/ethip/std.h
r2ff150e r081971b 53 53 #define ETYPE_IP 0x0800 54 54 55 #define ETH_FRAME_MIN_SIZE 60 56 55 57 #endif 56 58 -
uspace/srv/inet/inet_link.c
r2ff150e r081971b 182 182 inet_addrobj_t *addr; 183 183 184 static int first = 1; 184 185 /* XXX For testing: set static IP address 192.168.0.4/24 */ 185 186 addr = inet_addrobj_new(); 186 addr->naddr.ipv4 = (192 << 24) + (168 << 16) + (0 << 8) + 4; 187 if (first) { 188 addr->naddr.ipv4 = (127 << 24) + (0 << 16) + (0 << 8) + 1; 189 first = 0; 190 } else { 191 addr->naddr.ipv4 = (192 << 24) + (168 << 16) + (0 << 8) + 4; 192 } 187 193 addr->naddr.bits = 24; 188 194 addr->ilink = ilink;
Note:
See TracChangeset
for help on using the changeset viewer.