Changeset 0b749a3 in mainline for uspace/srv/hw/netif/dp8390/dp8390.c
- Timestamp:
- 2010-11-22T15:39:53Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 0eddb76, aae339e9
- Parents:
- 9a1d8ab (diff), 8cd1aa5e (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hw/netif/dp8390/dp8390.c
r9a1d8ab r0b749a3 34 34 35 35 #include <assert.h> 36 #include <byteorder.h> 36 37 #include <errno.h> 37 38 38 #include <net_byteorder.h>39 39 #include <netif_local.h> 40 #include < packet/packet.h>41 #include <packet /packet_client.h>40 #include <net/packet.h> 41 #include <packet_client.h> 42 42 43 43 #include "dp8390_drv.h" … … 62 62 * @param[in] dep The network interface structure. 63 63 * @param[in] packet The outgoing packet. 64 * @return sEOK on success.65 * @return sEINVAL64 * @return EOK on success. 65 * @return EINVAL 66 66 */ 67 int queue_packet(dpeth_t * dep, packet_t packet);67 int queue_packet(dpeth_t * dep, packet_t *packet); 68 68 69 69 /** Reads a memory block byte by byte. … … 336 336 } 337 337 338 int queue_packet(dpeth_t * dep, packet_t packet){339 packet_t tmp;338 int queue_packet(dpeth_t * dep, packet_t *packet){ 339 packet_t *tmp; 340 340 341 341 if(dep->packet_count >= MAX_PACKETS){ … … 361 361 * based on do_vwrite * 362 362 *===========================================================================*/ 363 int do_pwrite(dpeth_t * dep, packet_t packet, int from_int)363 int do_pwrite(dpeth_t * dep, packet_t *packet, int from_int) 364 364 { 365 365 // int port, count, size; … … 432 432 dep->de_write_iovec.iod_iovec[0].iov_size = size; 433 433 dep->de_write_iovec.iod_iovec_s = 1; 434 dep->de_write_iovec.iod_iovec_addr = NULL;434 dep->de_write_iovec.iod_iovec_addr = (uintptr_t) NULL; 435 435 436 436 if (size < ETH_MIN_PACK_SIZE || size > ETH_MAX_PACK_SIZE_TAGGED) … … 910 910 dpeth_t *dep; 911 911 { 912 packet_t packet;912 packet_t *packet; 913 913 914 914 // if (!(dep->de_flags &DEF_SEND_AVAIL)) … … 1003 1003 { 1004 1004 int last, count; 1005 packet_t packet;1005 packet_t *packet; 1006 1006 1007 1007 // if (!(dep->de_flags &DEF_READING)) … … 1015 1015 dep->de_read_iovec.iod_iovec[0].iov_size = length; 1016 1016 dep->de_read_iovec.iod_iovec_s = 1; 1017 dep->de_read_iovec.iod_iovec_addr = NULL;1017 dep->de_read_iovec.iod_iovec_addr = (uintptr_t) NULL; 1018 1018 1019 1019 last = page + (length - 1) / DP_PAGESIZE;
Note:
See TracChangeset
for help on using the changeset viewer.