PERFORCE change 68104 for review
Sam Leffler
sam at FreeBSD.org
Sat Jan 1 15:58:25 PST 2005
http://perforce.freebsd.org/chv.cgi?CH=68104
Change 68104 by sam at sam_ebb on 2005/01/01 23:57:45
IFC @ 68103
Affected files ...
.. //depot/projects/wifi/COPYRIGHT#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/cpuconf.c#2 integrate
.. //depot/projects/wifi/sys/alpha/include/rpb.h#2 integrate
.. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#4 integrate
.. //depot/projects/wifi/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/wifi/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/wifi/sys/dev/wi/if_wi.c#11 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#33 integrate
.. //depot/projects/wifi/sys/netipx/ipx_input.c#3 integrate
.. //depot/projects/wifi/sys/netipx/ipx_pcb.c#3 integrate
.. //depot/projects/wifi/sys/sys/msgbuf.h#2 integrate
.. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.newzealand#2 integrate
.. //depot/projects/wifi/usr.sbin/apm/apm.c#2 integrate
Differences ...
==== //depot/projects/wifi/COPYRIGHT#2 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/COPYRIGHT,v 1.5 2003/12/31 22:35:22 imp Exp $
+# $FreeBSD: src/COPYRIGHT,v 1.6 2005/01/01 07:29:19 sobomax Exp $
# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94
The compilation of software known as FreeBSD is distributed under the
following terms:
-Copyright (C) 1992-2004 The FreeBSD Project. All rights reserved.
+Copyright (C) 1992-2005 The FreeBSD Project. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
==== //depot/projects/wifi/sys/alpha/alpha/cpuconf.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.16 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.17 2005/01/01 16:11:53 wilko Exp $");
#include "opt_cpu.h"
@@ -122,41 +122,46 @@
#endif
struct cpuinit cpuinit[] = {
- cpu_notsupp("???"), /* 0: ??? */
- cpu_notsupp("ST_ADU"), /* 1: ST_ADU */
- cpu_notsupp("ST_DEC_4000"), /* 2: ST_DEC_4000 */
- cpu_notsupp("ST_DEC_7000"), /* 3: ST_DEC_7000 */
- cpu_notsupp("DEC_3000_500"), /* 4: ST_DEC_3000_500 */
- cpu_notsupp("???"), /* 5: ??? */
- cpu_notsupp("ST_DEC_2000_300"), /* 6: ST_DEC_2000_300 */
- cpu_notsupp("DEC_3000_300"), /* 7: ST_DEC_3000_300 */
- cpu_init(avalon_a12_init,"ST_AVALON_A12"), /* 8: ST_AVALON_A12 */
- cpu_init(dec_2100_a500_init, "ST_DEC_2100_A500"), /* 9: ST_DEC_2100_A500 */
- cpu_notsupp("ST_DEC_APXVME_64"), /* 10: ST_DEC_APXVME_64 */
- cpu_init(dec_axppci_33_init,"DEC_AXPPCI_33"),/* 11: ST_DEC_AXPPCI_33 */
- cpu_init(dec_kn8ae_init,"DEC_KN8AE"), /* 12: ST_DEC_21000 */
- cpu_init(dec_2100_a50_init,"DEC_2100_A50"), /* 13: ST_DEC_2100_A50 */
- cpu_notsupp("ST_DEC_MUSTANG"), /* 14: ST_DEC_MUSTANG */
- cpu_init(dec_kn20aa_init,"DEC_KN20AA"), /* 15: ST_DEC_KN20AA */
- cpu_notsupp("???"), /* 16: ??? */
- cpu_init(dec_1000a_init, "ST_DEC_1000"), /* 17: ST_DEC_1000 */
- cpu_notsupp("???"), /* 18: ??? */
- cpu_notsupp("ST_EB66"), /* 19: ST_EB66 */
- cpu_init(dec_eb64plus_init,"DEC_EB64PLUS"), /* 20: ST_EB64P */
- cpu_notsupp("ST_ALPHABOOK1"), /* 21: ST_ALPHABOOK1 */
- cpu_init(dec_kn300_init,"DEC_KN300"), /* 22: ST_DEC_4100 */
- cpu_notsupp("ST_DEC_EV45_PBP"), /* 23: ST_DEC_EV45_PBP */
- cpu_init(dec_2100_a500_init, "ST_DEC_2100A_A500"), /* 24: ST_DEC_2100A_A500 */
- cpu_notsupp("???"), /* 25: ??? */
- cpu_init(dec_eb164_init,"DEC_EB164"), /* 26: ST_EB164 */
- cpu_init(dec_1000a_init,"ST_DEC_1000A"), /* 27: ST_DEC_1000A */
- cpu_notsupp("ST_DEC_ALPHAVME_224"), /* 28: ST_DEC_ALPHAVME_224 */
- cpu_notsupp("???"), /* 29: ??? */
- cpu_init(st550_init,"DEC_ST550"), /* 30: ST_DEC_550 */
- cpu_notsupp("???"), /* 31: ??? */
- cpu_notsupp("ST_DEC_EV56_PBP"), /* 32: ST_DEC_EV56_PBP */
- cpu_notsupp("ST_DEC_ALPHAVME_320"), /* 33: ST_DEC_ALPHAVME_320 */
- cpu_init(st6600_init, "ST_DEC_ST6600"), /* 34: ST_DEC_6600 */
+ cpu_notsupp("???"), /* 0: ??? */
+ cpu_notsupp("ST_ADU"), /* 1: ADU */
+ cpu_notsupp("ST_DEC_4000"), /* 2: Cobra */
+ cpu_notsupp("ST_DEC_7000"), /* 3: Ruby */
+ cpu_notsupp("DEC_3000_500"), /* 4: Flamingo */
+ cpu_notsupp("???"), /* 5: simulator */
+ cpu_notsupp("ST_DEC_2000_300"), /* 6: Jensen */
+ cpu_notsupp("DEC_3000_300"), /* 7: Pelican */
+ cpu_init(avalon_a12_init,"ST_AVALON_A12"), /* 8: AVALON */
+ cpu_init(dec_2100_a500_init, "ST_DEC_2100_A500"), /* 9: Sable */
+ cpu_notsupp("ST_DEC_APXVME_64"), /* 10: AXPvme */
+ cpu_init(dec_axppci_33_init,"DEC_AXPPCI_33"), /* 11: NoName */
+ cpu_init(dec_kn8ae_init,"DEC_KN8AE"), /* 12: Turbolaser */
+ cpu_init(dec_2100_a50_init,"DEC_2100_A50"), /* 13: Avanti */
+ cpu_notsupp("ST_DEC_MUSTANG"), /* 14: Mustang */
+ cpu_init(dec_kn20aa_init,"DEC_KN20AA"), /* 15: Alcor */
+ cpu_notsupp("cancelled"), /* 16: cancelled */
+ cpu_init(dec_1000a_init, "ST_DEC_1000"), /* 17: Mikasa */
+ cpu_notsupp("ST_DEC_EB64"), /* 18: EB64 */
+ cpu_notsupp("ST_EB66"), /* 19: EB66 */
+ cpu_init(dec_eb64plus_init,"DEC_EB64PLUS"), /* 20: EB64+ */
+ cpu_notsupp("ST_ALPHABOOK1"), /* 21: AlphaBook */
+ cpu_init(dec_kn300_init,"DEC_KN300"), /* 22: Rawhide */
+ cpu_notsupp("ST_DEC_EV45_PBP"), /* 23: K2 */
+ cpu_init(dec_2100_a500_init, "ST_DEC_2100A_A500"), /* 24: Lynx */
+ cpu_notsupp("ST_DEC_ALPHAXL"), /* 25: AlphaXL */
+ cpu_init(dec_eb164_init,"DEC_EB164"), /* 26: EB164 */
+ cpu_init(dec_1000a_init,"ST_DEC_1000A"), /* 27: Noritake */
+ cpu_notsupp("ST_DEC_ALPHAVME_224"), /* 28: Cortex */
+ cpu_notsupp("unused"), /* 29: unused */
+ cpu_init(st550_init,"DEC_ST550"), /* 30: Miata */
+ cpu_notsupp("ST_DEC_XXM"), /* 31: XXM */
+ cpu_notsupp("ST_DEC_EV56_PBP"), /* 32: Takara */
+ cpu_notsupp("ST_DEC_ALPHAVME_320"), /* 33: Yukon */
+ cpu_init(st6600_init, "ST_DEC_ST6600"), /* 34: Tsunami */
+ cpu_notsupp("ST_DEC_WILDFIRE"), /* 35: Wildfire */
+ cpu_notsupp("ST_DEC_CUSCO"), /* 36: Cusco */
+ cpu_notsupp("ST_DEC_EIGER"), /* 37: Eiger */
+ cpu_notsupp("ST_DEC_TITAN"), /* 38: Titan */
+ cpu_notsupp("ST_DEC_MARVEL") /* 39: Marvel */
};
int ncpuinit = (sizeof(cpuinit) / sizeof(cpuinit[0]));
==== //depot/projects/wifi/sys/alpha/include/rpb.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: rpb.h,v 1.20 1998/04/15 00:47:33 mjacob Exp $ */
-/* $FreeBSD: src/sys/alpha/include/rpb.h,v 1.9 2001/03/30 22:04:08 gallatin Exp $ */
+/* $FreeBSD: src/sys/alpha/include/rpb.h,v 1.10 2005/01/01 16:11:53 wilko Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -50,36 +50,46 @@
u_int64_t rpb_max_asn; /* 38: (16) */
char rpb_ssn[16]; /* 40: only first 10 valid */
-#define ST_ADU 1 /* Alpha Demo. Unit (?) */
-#define ST_DEC_4000 2 /* "Cobra" (?) */
-#define ST_DEC_7000 3 /* "Ruby" (?) */
+#define ST_ADU 1 /* Alpha Demo. Unit */
+#define ST_DEC_4000 2 /* "Cobra/Fang" (?) */
+#define ST_DEC_7000 3 /* "Ruby/Laser" (?) */
#define ST_DEC_3000_500 4 /* "Flamingo" family (TC) */
+ /* 5 = "Mannequin" simulator */
#define ST_DEC_2000_300 6 /* "Jensen" (EISA/ISA) */
#define ST_DEC_3000_300 7 /* "Pelican" (TC) */
#define ST_AVALON_A12 8 /* XXX Avalon Multicomputer */
-#define ST_DEC_2100_A500 9 /* "Sable" (?) */
-#define ST_DEC_APXVME_64 10 /* "AXPvme" (VME?) */
-#define ST_DEC_AXPPCI_33 11 /* "NoName" (PCI/ISA) */
+#define ST_DEC_2100_A500 9 /* "Sable" (EISA/PCI) */
+#define ST_DEC_APXVME_64 10 /* "AXPvme" (VME) */
+#define ST_DEC_AXPPCI_33 11 /* "NoName" (PCI/ISA/PCMCIA) */
#define ST_DEC_21000 12 /* "TurboLaser" (PCI/EISA) */
#define ST_DEC_2100_A50 13 /* "Avanti" (PCI/ISA) */
#define ST_DEC_MUSTANG 14 /* "Mustang" (?) */
-#define ST_DEC_KN20AA 15 /* kn20aa (PCI/EISA) */
-#define ST_DEC_1000 17 /* "Mikasa" (PCI/ISA?) */
+#define ST_DEC_KN20AA 15 /* "Alcor" (PCI/EISA) */
+ /* 16 = cancelled */
+#define ST_DEC_1000 17 /* "Mikasa" (PCI/EISA) */
+#define ST_DEC_EB64 18 /* EB64 (PCI/ISA?) */
#define ST_EB66 19 /* EB66 (PCI/ISA?) */
#define ST_EB64P 20 /* EB64+ (PCI/ISA?) */
#define ST_ALPHABOOK1 21 /* Alphabook (?) */
#define ST_DEC_4100 22 /* "Rawhide" (PCI/EISA) */
-#define ST_DEC_EV45_PBP 23 /* "Lego" (?) */
-#define ST_DEC_2100A_A500 24 /* "Lynx" (?) */
+#define ST_DEC_EV45_PBP 23 /* "K2" (PCI/ISA) */
+#define ST_DEC_2100A_A500 24 /* "Lynx" (EISA/PCI) */
+#define ST_DEC_ALPHAXL 25 /* AlphaXL (PCI/ISA) */
#define ST_EB164 26 /* EB164 (PCI/ISA) */
-#define ST_DEC_1000A 27 /* "Noritake" (?) */
-#define ST_DEC_ALPHAVME_224 28 /* "Cortex" (?) */
+#define ST_DEC_1000A 27 /* "Noritake" (PCI/EISA) */
+#define ST_DEC_ALPHAVME_224 28 /* "Cortex" (VME) */
+ /* 29 = unused */
#define ST_DEC_550 30 /* "Miata" (PCI/ISA) */
-#define ST_DEC_EV56_PBP 32 /* "Takara" (?) */
-#define ST_DEC_ALPHAVME_320 33 /* "Yukon" (VME?) */
-#define ST_DEC_6600 34 /* "Monet/Goldrush" */
-#define ST_DEC_CUSCO 36 /* "CUSCO" */
+#define ST_DEC_XXM 31 /* "XXM" ?? */
+#define ST_DEC_EV56_PBP 32 /* "Takara" (PCI/ISA) */
+#define ST_DEC_ALPHAVME_320 33 /* "Yukon" (VME) */
+#define ST_DEC_6600 34 /* "Tsunami/Typhoon" (PCI) */
+#define ST_DEC_WILDFIRE 35 /* "Wildfire" (PCI)" */
+#define ST_DEC_CUSCO 36 /* "Cusco" */
#define ST_DEC_EIGER 37 /* "Eiger" */
+#define ST_DEC_TITAN 38 /* "Titan" ES45 (PCI) */
+#define ST_DEC_MARVEL 39 /* "Marvel" (PCI) */
+ /* 40 = "Phoenix" (cPCI) */
/*
* System types for Alpha Processor Inc. machines
==== //depot/projects/wifi/sys/dev/ata/ata-chipset.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.97 2004/12/24 13:36:04 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.98 2005/01/01 19:24:25 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -1367,6 +1367,11 @@
return ENXIO;
}
+ if (ctlr->chip->max_dma >= ATA_SA150)
+ ctlr->setmode = ata_sata_setmode;
+ else
+ ctlr->setmode = ata_promise_setmode;
+
switch (ctlr->chip->cfg1) {
case PRNEW:
/* setup clocks */
@@ -1413,22 +1418,33 @@
ctlr->dmainit = ata_promise_mio_dmainit;
ctlr->allocate = ata_promise_mio_allocate;
- if (ctlr->chip->cfg2 & PRPATA) {
- ctlr->channels = ((ATA_INL(ctlr->r_res2, 0x48) & 0x01) > 0) +
- ((ATA_INL(ctlr->r_res2, 0x48) & 0x02) > 0) + 2;
- }
- else if (ctlr->chip->cfg2 & PRCMBO) {
- ATA_OUTL(ctlr->r_res2, 0x06c, 0x000000ff);
- ctlr->channels = ((ATA_INL(ctlr->r_res2, 0x48) & 0x02) > 0) + 3;
- }
- else if (ctlr->chip->cfg2 & PRCMBO2) {
- ATA_OUTL(ctlr->r_res2, 0x060, 0x000000ff);
- ctlr->channels = 3;
- }
- else
- ctlr->channels = 4;
+ switch (ctlr->chip->cfg2) {
+ case PRPATA:
+ ctlr->channels = ((ATA_INL(ctlr->r_res2, 0x48) & 0x01) > 0) +
+ ((ATA_INL(ctlr->r_res2, 0x48) & 0x02) > 0) + 2;
+ break;
+
+ case PRCMBO:
+ ATA_OUTL(ctlr->r_res2, 0x06c, 0x000000ff);
+ ctlr->channels = ((ATA_INL(ctlr->r_res2, 0x48) & 0x02) > 0) + 3;
+ break;
+
+ case PRSATA:
+ ATA_OUTL(ctlr->r_res2, 0x06c, 0x000000ff);
+ ctlr->channels = 4;
+ break;
+
+ case PRCMBO2:
+ ATA_OUTL(ctlr->r_res2, 0x060, 0x000000ff);
+ ctlr->channels = 3;
+ break;
+
+ case PRSATA2:
+ ATA_OUTL(ctlr->r_res2, 0x060, 0x000000ff);
+ ctlr->channels = 4;
+ break;
- if (ctlr->chip->cfg2 & PRSX4X) {
+ case PRSX4X: {
struct ata_promise_sx4 *hpkt;
u_int32_t dimm = ATA_INL(ctlr->r_res2, 0x000c0080);
@@ -1448,26 +1464,25 @@
mtx_init(&hpkt->mtx, "ATA promise HPKT lock", NULL, MTX_DEF);
hpkt->busy = hpkt->head = hpkt->tail = 0;
+ ctlr->channels = 4;
+
if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS,
ata_promise_sx4_intr, ctlr, &ctlr->handle))) {
device_printf(dev, "unable to setup interrupt\n");
return ENXIO;
}
+ return 0;
+ }
}
- else {
- if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS,
- ata_promise_mio_intr, ctlr, &ctlr->handle))) {
- device_printf(dev, "unable to setup interrupt\n");
- return ENXIO;
- }
+
+ if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS,
+ ata_promise_mio_intr, ctlr, &ctlr->handle))) {
+ device_printf(dev, "unable to setup interrupt\n");
+ return ENXIO;
}
- break;
+ return 0;
}
- if (ctlr->chip->max_dma >= ATA_SA150)
- ctlr->setmode = ata_sata_setmode;
- else
- ctlr->setmode = ata_promise_setmode;
- return 0;
+ return ENXIO;
}
static int
@@ -1587,13 +1602,13 @@
struct ata_pci_controller *ctlr =
device_get_softc(device_get_parent(ch->dev));
- if (ctlr->chip->cfg2 & PRSX4X) {
+ switch (ctlr->chip->cfg2) {
+ case PRSX4X: {
struct ata_promise_sx4 *hpktp = ctlr->driver;
- /* softreset channels ATA module */
+ /* softreset channel ATA module */
ATA_OUTL(ctlr->r_res2, 0xc0260 + (ch->unit << 7), ch->unit + 1);
DELAY(1000);
-
ATA_OUTL(ctlr->r_res2, 0xc0260 + (ch->unit << 7),
(ATA_INL(ctlr->r_res2, 0xc0260 + (ch->unit << 7)) &
~0x00003f9f) | (ch->unit + 1));
@@ -1606,8 +1621,20 @@
ATA_OUTL(ctlr->r_res2, 0xc012c,
(ATA_INL(ctlr->r_res2, 0xc012c) & ~0x00000f9f));
mtx_unlock(&hpktp->mtx);
- }
- else if (ctlr->chip->cfg2 & PRSATA) {
+ }
+ break;
+
+ case PRCMBO:
+ case PRCMBO2:
+ /* softreset channel ATA module */
+ ATA_OUTL(ctlr->r_res2, 0x0260 + (ch->unit << 7), (1 << 11));
+ ata_udelay(10000);
+ ATA_OUTL(ctlr->r_res2, 0x0260 + (ch->unit << 7),
+ (ATA_INL(ctlr->r_res2, 0x0260 + (ch->unit << 7)) &
+ ~0x00003f9f) | (ch->unit + 1));
+ break;
+
+ case PRSATA: {
u_int32_t status = 0;
int timeout;
@@ -1633,14 +1660,16 @@
if (timeout >= 1000000)
device_printf(ch->dev, "connect status=%08x\n", status);
- /* enable plug/unplug intr */
+ /* reset and enable plug/unplug intr */
ATA_OUTL(ctlr->r_res2, 0x06c, (0x00000011 << ch->unit));
- }
- else if (ctlr->chip->cfg2 & PRSATA2) {
+ }
+ break;
+
+ case PRSATA2: {
u_int32_t status = 0;
int timeout;
- /* set PM port */
+ /* set portmultiplier port */
ATA_OUTL(ctlr->r_res2, 0x4e8 + (ch->unit << 8), 0x0f);
/* mask plug/unplug intr */
@@ -1670,11 +1699,13 @@
if (timeout >= 1000000)
device_printf(ch->dev, "connect status=%08x\n", status);
- /* enable plug/unplug intr */
+ /* reset and enable plug/unplug intr */
ATA_OUTL(ctlr->r_res2, 0x060, (0x00000011 << ch->unit));
- /* set PM port */
- ATA_OUTL(ctlr->r_res2, 0x4e8 + (ch->unit * 0x100), 0x00);
+ /* set portmultiplier port */
+ ATA_OUTL(ctlr->r_res2, 0x4e8 + (ch->unit << 8), 0x00);
+ }
+ break;
}
}
==== //depot/projects/wifi/sys/dev/em/if_em.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
***************************************************************************/
-/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.54 2004/11/14 20:20:28 rwatson Exp $*/
+/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.56 2005/01/01 19:57:23 tackerman Exp $*/
#include <dev/em/if_em.h>
@@ -80,6 +80,7 @@
{ 0x8086, 0x1011, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, 0x1012, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, 0x1013, PCI_ANY_ID, PCI_ANY_ID, 0},
+ { 0x8086, 0x1014, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, 0x1015, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, 0x1016, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, 0x1017, PCI_ANY_ID, PCI_ANY_ID, 0},
@@ -99,6 +100,7 @@
{ 0x8086, 0x107A, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, 0x107B, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, 0x107C, PCI_ANY_ID, PCI_ANY_ID, 0},
+ { 0x8086, 0x108A, PCI_ANY_ID, PCI_ANY_ID, 0},
/* required last entry */
{ 0, 0, 0, 0, 0}
};
@@ -3003,8 +3005,20 @@
static void
em_disable_intr(struct adapter *adapter)
{
- E1000_WRITE_REG(&adapter->hw, IMC,
- (0xffffffff & ~E1000_IMC_RXSEQ));
+ /*
+ * The first version of 82542 had an errata where when link was forced it
+ * would stay up even up even if the cable was disconnected. Sequence errors
+ * were used to detect the disconnect and then the driver would unforce the link.
+ * This code in the in the ISR. For this to work correctly the Sequence error
+ * interrupt had to be enabled all the time.
+ */
+
+ if (adapter->hw.mac_type == em_82542_rev2_0)
+ E1000_WRITE_REG(&adapter->hw, IMC,
+ (0xffffffff & ~E1000_IMC_RXSEQ));
+ else
+ E1000_WRITE_REG(&adapter->hw, IMC,
+ 0xffffffff);
return;
}
==== //depot/projects/wifi/sys/dev/sym/sym_hipd.c#2 (text+ko) ====
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.50 2004/09/10 18:39:02 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.51 2005/01/01 19:05:46 se Exp $");
#define SYM_DRIVER_NAME "sym-1.6.5-20000902"
@@ -431,7 +431,11 @@
*/
#define MEMO_SHIFT 4 /* 16 bytes minimum memory chunk */
+#ifndef __amd64__
#define MEMO_PAGE_ORDER 0 /* 1 PAGE maximum */
+#else
+#define MEMO_PAGE_ORDER 1 /* 2 PAGEs maximum on amd64 */
+#endif
#if 0
#define MEMO_FREE_UNUSED /* Free unused pages immediately */
#endif
@@ -440,8 +444,14 @@
#define MEMO_CLUSTER_SIZE (1UL << MEMO_CLUSTER_SHIFT)
#define MEMO_CLUSTER_MASK (MEMO_CLUSTER_SIZE-1)
+#ifndef __amd64__
#define get_pages() malloc(MEMO_CLUSTER_SIZE, M_DEVBUF, M_NOWAIT)
#define free_pages(p) free((p), M_DEVBUF)
+#else
+#define get_pages() contigmalloc(MEMO_CLUSTER_SIZE, M_DEVBUF, \
+ 0, 0, 1LL << 32, PAGE_SIZE, 1LL << 32)
+#define free_pages(p) contigfree((p), MEMO_CLUSTER_SIZE, M_DEVBUF)
+#endif
typedef u_long m_addr_t; /* Enough bits to bit-hack addresses */
==== //depot/projects/wifi/sys/dev/wi/if_wi.c#11 (text+ko) ====
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.173 2004/12/17 20:48:13 mdodd Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.174 2005/01/01 17:45:11 sam Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#33 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.30 2004/12/31 22:42:38 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.31 2005/01/01 17:48:27 sam Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -547,23 +547,23 @@
(b->ni_capinfo & IEEE80211_CAPINFO_PRIVACY))
return -1;
- /* best/max rate preferred if signal level close enough XXX */
- maxa = maxrate(a);
- maxb = maxrate(b);
rssia = ic->ic_node_getrssi(a);
rssib = ic->ic_node_getrssi(b);
- if (maxa != maxb && abs(rssib - rssia) < 5)
- return maxa - maxb;
-
- /* XXX use freq for channel preference */
- /* for now just prefer 5Ghz band to all other bands */
- if (IEEE80211_IS_CHAN_5GHZ(a->ni_chan) &&
- !IEEE80211_IS_CHAN_5GHZ(b->ni_chan))
- return 1;
- if (!IEEE80211_IS_CHAN_5GHZ(a->ni_chan) &&
- IEEE80211_IS_CHAN_5GHZ(b->ni_chan))
- return -1;
-
+ if (abs(rssib - rssia) < 5) {
+ /* best/max rate preferred if signal level close enough XXX */
+ maxa = maxrate(a);
+ maxb = maxrate(b);
+ if (maxa != maxb)
+ return maxa - maxb;
+ /* XXX use freq for channel preference */
+ /* for now just prefer 5Ghz band to all other bands */
+ if (IEEE80211_IS_CHAN_5GHZ(a->ni_chan) &&
+ !IEEE80211_IS_CHAN_5GHZ(b->ni_chan))
+ return 1;
+ if (!IEEE80211_IS_CHAN_5GHZ(a->ni_chan) &&
+ IEEE80211_IS_CHAN_5GHZ(b->ni_chan))
+ return -1;
+ }
/* all things being equal, use signal level */
return rssia - rssib;
}
==== //depot/projects/wifi/sys/netipx/ipx_input.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netipx/ipx_input.c,v 1.38 2004/12/31 17:05:37 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_input.c,v 1.39 2005/01/01 22:04:03 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,6 @@
/*
* IPX protocol control block (pcb) lists.
*/
-u_short ipxpcb_lport_cache;
struct ipxpcbhead ipxpcb_list;
struct ipxpcbhead ipxrawpcb_list;
==== //depot/projects/wifi/sys/netipx/ipx_pcb.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.33 2004/12/31 17:05:37 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.34 2005/01/01 22:04:03 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,6 +53,7 @@
#include <netipx/ipx_var.h>
static struct ipx_addr zeroipx_addr;
+static u_short ipxpcb_lport_cache;
int
ipx_pcballoc(so, head, td)
==== //depot/projects/wifi/sys/sys/msgbuf.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)msgbuf.h 8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/sys/sys/msgbuf.h,v 1.25 2004/04/07 04:19:49 imp Exp $
+ * $FreeBSD: src/sys/sys/msgbuf.h,v 1.26 2005/01/01 21:49:20 obrien Exp $
*/
#ifndef _SYS_MSGBUF_H_
@@ -68,8 +68,12 @@
void msgbuf_reinit(struct msgbuf *mbp, void *ptr, int size);
#ifndef MSGBUF_SIZE
+#ifdef __amd64__
+#define MSGBUF_SIZE (32768 * 2)
+#else
#define MSGBUF_SIZE 32768
#endif
+#endif
#endif /* KERNEL */
#endif /* !_SYS_MSGBUF_H_ */
==== //depot/projects/wifi/usr.bin/calendar/calendars/calendar.newzealand#2 (text+ko) ====
@@ -1,7 +1,7 @@
/*
* New Zealand holidays
*
- * $FreeBSD: src/usr.bin/calendar/calendars/calendar.newzealand,v 1.1 2001/11/15 02:35:14 grog Exp $
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.newzealand,v 1.2 2005/01/01 18:58:28 ceri Exp $
*/
#ifndef _calendar_newzealand_
@@ -22,4 +22,4 @@
Nov 15 Anniversary Day (Canterbury)
Dec 02 Anniversary Day (Chatham Islands)
-#endif+#endif
==== //depot/projects/wifi/usr.sbin/apm/apm.c#2 (text+ko) ====
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/apm/apm.c,v 1.36 2004/06/30 21:00:07 imp Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/apm/apm.c,v 1.37 2005/01/01 22:07:06 maxim Exp $");
#include <sys/file.h>
#include <sys/ioctl.h>
@@ -27,8 +27,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
#include <time.h>
#include <unistd.h>
More information about the p4-projects
mailing list