HelenOSHelenOS-docHelenOS-historic

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /branches/network/uspace/srv/net/netif/dp8390/dp8390.h @ 4191

  → /branches/network/uspace/srv/net/netif/dp8390/dp8390.h @ 4192

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 4191 → Rev 4192

/branches/network/uspace/srv/net/netif/dp8390/dp8390.h
35,6 → 35,8
#ifndef __NET_NETIF_DP8390_H__
#define __NET_NETIF_DP8390_H__
#include "../../structures/packet/packet.h"
#include "dp8390_port.h"
#include "local.h"
216,9 → 218,9
//struct iovec_dat_s;
_PROTOTYPE( typedef void (*dp_initf_t), (struct dpeth *dep) );
_PROTOTYPE( typedef void (*dp_stopf_t), (struct dpeth *dep) );
//_PROTOTYPE( typedef void (*dp_user2nicf_t), (struct dpeth *dep,
// struct iovec_dat *iovp, vir_bytes offset,
// int nic_addr, vir_bytes count) );
_PROTOTYPE( typedef void (*dp_user2nicf_t), (struct dpeth *dep,
struct iovec_dat *iovp, vir_bytes offset,
int nic_addr, vir_bytes count) );
//_PROTOTYPE( typedef void (*dp_user2nicf_s_t), (struct dpeth *dep,
// struct iovec_dat_s *iovp, vir_bytes offset,
// int nic_addr, vir_bytes count) );
236,7 → 238,9
int page, size_t offset, size_t size, void *dst) );
/* iovectors are handled IOVEC_NR entries at a time. */
#define IOVEC_NR 16
//#define IOVEC_NR 16
// no vectors allowed
#define IOVEC_NR 1
/*
typedef int irq_hook_t;
245,6 → 249,7
{
iovec_t iod_iovec[IOVEC_NR];
int iod_iovec_s;
// no direct process access
int iod_proc_nr;
vir_bytes iod_iovec_addr;
} iovec_dat_t;
263,6 → 268,14
typedef struct dpeth
{
/* Parent device structure.
*/
void * parent;
/* Packet send queue.
*/
packet_t packet_queue;
int packet_count;
/* The de_base_port field is the starting point of the probe.
* The conf routine also fills de_linmem and de_irq. If the probe
* routine knows the irq and/or memory address because they are
325,7 → 338,7
iovec_dat_t de_read_iovec;
// iovec_dat_s_t de_read_iovec_s;
// int de_safecopy_read;
// iovec_dat_t de_write_iovec;
iovec_dat_t de_write_iovec;
// iovec_dat_s_t de_write_iovec_s;
iovec_dat_t de_tmp_iovec;
// iovec_dat_s_t de_tmp_iovec_s;
332,7 → 345,7
vir_bytes de_read_s;
// int de_client;
// message de_sendmsg;
// dp_user2nicf_t de_user2nicf;
dp_user2nicf_t de_user2nicf;
// dp_user2nicf_s_t de_user2nicf_s;
dp_nic2userf_t de_nic2userf;
// dp_nic2userf_s_t de_nic2userf_s;