merge

diff --git a/sys/man/2/9p b/sys/man/2/9p
index db0e181dd96925587bfbf4704a1b9f02bddc356e..c13c4fac10a1571d3175e57ba304badf90fc44d8 100644 (file)
--- a/sys/man/2/9p
+++ b/sys/man/2/9p
@@ -226,7 +226,7 @@ is non-nil, post the other end file descriptor under the name
 .IP
 Initialize
 .IB s -> forker
-to eigther
+to either
 .I srvforker
 or
 .I threadsrvforker

diff --git a/sys/src/9/pc/etheriwl.c b/sys/src/9/pc/etheriwl.c
index 809532e12d7def065de4f8c029331fb40338fa66..f003b5da7160b138366345decf87b4213b121d69 100644 (file)
--- a/sys/src/9/pc/etheriwl.c
+++ b/sys/src/9/pc/etheriwl.c
@@ -1,10 +1,9 @@
 /*
  * Intel WiFi Link driver.
  *
- * Written without any documentation but Damien Bergamini's
- * iwn(4) and Stefan Sperling's iwm(4) OpenBSD driver sources.
- * Requires Intel firmware to be present in /lib/firmware/iw[nm]-*
- * on attach.
+ * Written without any documentation but Damien Bergaminis
+ * OpenBSD iwn(4) and iwm(4) driver sources. Requires intel
+ * firmware to be present in /lib/firmware/iwn-* on attach.
  */
 
 #include "u.h"
@@ -243,8 +242,6 @@ enum {
 
        SbCpu1Status    = 0xa01e30,
        SbCpu2Status    = 0xa01e34,
-       OscClk          = 0xa04068,
-               OscClkCtrl      = 1<<3,
        UregChick       = 0xa05c00,
                UregChickMsiEnable      = 1<<24,
 
@@ -635,7 +632,6 @@ enum {
        Type2030        = 12,
        Type2000        = 16,
 
-       Type7260        = 30,
        Type8265        = 35,
 };
 
@@ -690,7 +686,6 @@ static char *fwname[32] = {
        [Type6005] "iwn-6005", /* see in iwlattach() below */
        [Type2030] "iwn-2030",
        [Type2000] "iwn-2000",
-       [Type7260] "iwm-7260-17",
 };
 
 static char *qcmd(Ctlr *ctlr, uint qid, uint code, uchar *data, int size, Block *block);
@@ -1093,23 +1088,6 @@ poweron(Ctlr *ctlr)
                nicunlock(ctlr);
        }
 
-       /* Enable the oscillator to count wake up time for L1 exit. (weird W/A) */
-       if(ctlr->type == Type7260){
-               if((err = niclock(ctlr)) != nil)
-                       return err;
-
-               prphread(ctlr, OscClk);
-               prphread(ctlr, OscClk);
-               delay(20);
-
-               prphwrite(ctlr, OscClk, prphread(ctlr, OscClk) | OscClkCtrl);
-
-               prphread(ctlr, OscClk);
-               prphread(ctlr, OscClk);
-
-               nicunlock(ctlr);
-       }
-
        if(ctlr->family < 8000){
                if((err = niclock(ctlr)) != nil)
                        return err;
@@ -2822,15 +2800,6 @@ disablebeaconfilter(Ctlr *ctlr)
        return cmd(ctlr, 210, c, 11*4);
 }
 
-static void
-tttxbackoff(Ctlr *ctlr)
-{
-       uchar c[4];
-       
-       put32(c, 0);
-       cmd(ctlr, 126, c, sizeof(c));
-}
-
 static char*
 updatedevicepower(Ctlr *ctlr)
 {
@@ -2895,10 +2864,6 @@ postboot7000(Ctlr *ctlr)
                if((err = sendbtcoexadv(ctlr)) != nil)
                        return err;
 
-               /* Initialize tx backoffs to the minimum. */
-               if(ctlr->family == 7000)
-                       tttxbackoff(ctlr);
-
                if((err = updatedevicepower(ctlr)) != nil){
                        print("can't update device power: %s\n", err);
                        return err;
@@ -3451,12 +3416,6 @@ qcmd(Ctlr *ctlr, uint qid, uint code, uchar *data, int size, Block *block)
                iunlock(ctlr);
                return "qcmd: broken";
        }
-       /* wake up the nic (just needed for 7k) */
-       if(ctlr->family == 7000 && q->n == 0)
-               if(niclock(ctlr) != nil){
-                       iunlock(ctlr);
-                       return "qcmd: busy";
-               }
        q->n++;
        q->lastcmd = code;
 
@@ -4283,9 +4242,6 @@ receive(Ctlr *ctlr)
                if(tx != nil && tx->n > 0){
                        tx->n--;
                        wakeup(tx);
-                       /* unlock 7k family nics as all commands are done */
-                       if(ctlr->family == 7000 && tx->n == 0)
-                               nicunlock(ctlr);
                }
        }
 
@@ -4395,11 +4351,6 @@ iwlpci(void)
                        family = 0;
                        fwname = nil;
                        break;
-               case 0x08b1:    /* Wireless AC 7260 */
-               case 0x08b2:    /* Wireless AC 7260 */
-                       family = 7000;
-                       fwname = nil;
-                       break;
                case 0x24f3:    /* Wireless AC 8260 */
                        family = 8000;
                        fwname = "iwm-8000C-34";

diff --git a/sys/src/cmd/aux/cddb.c b/sys/src/cmd/aux/cddb.c
index 09c9373dc8a8455a12352bef6234089f9bece9cc..5c36ed4c86a74a145e1c35edb9e82f7563933072 100644 (file)
--- a/sys/src/cmd/aux/cddb.c
+++ b/sys/src/cmd/aux/cddb.c
@@ -91,7 +91,7 @@ dumpencode(Toc *t)
        quotefmtinstall();
        for(i=0; i < t->ntrack; i++){
                print("</mnt/cd/a%03d audio/flacenc ", i);
-               print("-T 'title='^%q -T 'trackno=%d' ", t->track[i].title, i+1);
+               print("-T 'title='^%q -T 'album='^%q -T 'track=%d' ", t->track[i].title, t->title, i+1);
                if(t->year[0] != 0)
                        print("-T 'year='^%q ", t->year);
                if(t->track[i].artist[0] != 0 || t->artist[0] != 0)