[src/netbsd-1-5]: src/sys/dev/ic Pull up revisions 1.6-1.7 (requested by tsut...

[jhawk <jhawk%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/94d95ad4bcbb
branches:  netbsd-1-5
changeset: 490481:94d95ad4bcbb
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Thu Jan 25 07:23:15 2001 +0000

description:
Pull up revisions 1.6-1.7 (requested by tsutsui):
  Clean up receive interrupt routine and fix DMA buffer handing
  for receive buffering.
  Add missed bus_dmamem_free() in rtk_detach().
  Some cosmetic fixes.

diffstat:

 sys/dev/ic/rtl81x9var.h |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 173a0f2cd39e -r 94d95ad4bcbb sys/dev/ic/rtl81x9var.h
--- a/sys/dev/ic/rtl81x9var.h   Thu Jan 25 07:23:10 2001 +0000
+++ b/sys/dev/ic/rtl81x9var.h   Thu Jan 25 07:23:15 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtl81x9var.h,v 1.5 2000/05/19 13:42:29 tsutsui Exp $   */
+/*     $NetBSD: rtl81x9var.h,v 1.5.4.1 2001/01/25 07:23:15 jhawk Exp $ */
 
 /*
  * Copyright (c) 1997, 1998
@@ -35,15 +35,14 @@
  */
 
 #define RTK_ETHER_ALIGN        2
+#define RTK_RXSTAT_LEN 4
 
 struct rtk_chain_data {
-       u_int16_t               cur_rx;
        caddr_t                 rtk_rx_buf;
-       caddr_t                 rtk_rx_buf_ptr;
 
        struct mbuf             *rtk_tx_chain[RTK_TX_LIST_CNT];
-       u_int8_t                last_tx;
-       u_int8_t                cur_tx;
+       int                     last_tx;
+       int                     cur_tx;
 };
 
 #define RTK_INC(x)             (x = (x + 1) % RTK_TX_LIST_CNT)
@@ -88,7 +87,7 @@
        struct callout          rtk_tick_ch;    /* tick callout */
        bus_space_handle_t      rtk_bhandle;    /* bus space handle */
        bus_space_tag_t         rtk_btag;       /* bus space tag */
-       u_int8_t                rtk_type;
+       int                     rtk_type;
        struct rtk_chain_data   rtk_cdata;
        bus_dma_tag_t           sc_dmat;
        bus_dma_segment_t       sc_dmaseg;