33c33
< * $FreeBSD: head/sys/dev/firewire/fwohci.c 109890 2003-01-26 15:39:04Z simokawa $
---
> * $FreeBSD: head/sys/dev/firewire/fwohci.c 109892 2003-01-26 18:38:06Z simokawa $
831c831,832
< db->db.desc.cmd = OHCI_OUTPUT_MORE | OHCI_KEY_ST2 | hdr_len;
---
> db->db.desc.control = OHCI_OUTPUT_MORE | OHCI_KEY_ST2;
> db->db.desc.reqcount = hdr_len;
845,846c846,847
< db->db.desc.cmd
< = OHCI_OUTPUT_MORE | ((len - hdr_off) & 0xffff);
---
> db->db.desc.control = OHCI_OUTPUT_MORE;
> db->db.desc.reqcount = len - hdr_off;
862c863,864
< db->db.desc.cmd = OHCI_OUTPUT_MORE | m->m_len;
---
> db->db.desc.control = OHCI_OUTPUT_MORE;
> db->db.desc.reqcount = m->m_len;
881c883
< db->db.desc.cmd |= OHCI_OUTPUT_LAST
---
> db->db.desc.control |= OHCI_OUTPUT_LAST
1300a1303
> volatile struct fwohcidb *db;
1331c1334,1335
< db_tr->db[0].db.desc.depend
---
> db = db_tr->db;
> db[0].db.desc.depend = db[db_tr->dbcnt - 1].db.desc.depend
1333,1334d1336
< db_tr->db[db_tr->dbcnt - 1].db.desc.depend
< = vtophys(STAILQ_NEXT(db_tr, link)->db) | z;
1337c1339
< db_tr->db[db_tr->dbcnt - 1].db.desc.cmd
---
> db[db_tr->dbcnt - 1].db.desc.control
1339,1341d1340
< db_tr->db[0].db.desc.depend &= ~0xf;
< db_tr->db[db_tr->dbcnt - 1].db.desc.depend &=
< ~0xf;
1343,1344c1342,1346
< db_tr->db[0].db.desc.cmd
< |= OHCI_INTERRUPT_ALWAYS;
---
> db[0].db.desc.control |= OHCI_INTERRUPT_ALWAYS;
> #if 0
> db[0].db.desc.depend &= ~0xf;
> db[db_tr->dbcnt - 1].db.desc.depend &= ~0xf;
> #endif
1357c1359
< int idb, z, i, dmach = 0;
---
> int idb, z, i, dmach = 0, ldesc;
1359a1362
> volatile struct fwohcidb *db;
1406c1409,1411
< db_tr->db[db_tr->dbcnt - 1].db.desc.depend
---
> db = db_tr->db;
> ldesc = db_tr->dbcnt - 1;
> db[ldesc].db.desc.depend
1410c1415
< db_tr->db[db_tr->dbcnt - 1].db.desc.cmd
---
> db[ldesc].db.desc.control
1412,1413c1417
< db_tr->db[db_tr->dbcnt - 1].db.desc.depend &=
< ~0xf;
---
> db[ldesc].db.desc.depend &= ~0xf;
1483a1488
> ldesc = dbch->ndesc - 1;
1490c1495
< ldesc = dbch->ndesc - 1;
---
> #if 0
1495a1501
> #endif
1498c1504,1505
< db[ldesc].db.desc.cmd |= OHCI_BRANCH_ALWAYS;
---
> db[ldesc].db.desc.control |= OHCI_BRANCH_ALWAYS;
> #if 0 /* if bulkxfer->npacket changes */
1501a1509,1512
> #else
> db[0].db.desc.depend |= dbch->ndesc;
> db[ldesc].db.desc.depend |= dbch->ndesc;
> #endif
1617a1629
> #if 0
1620a1633,1635
> #else
> db[ldesc].db.desc.depend |= dbch->ndesc;
> #endif
2212c2227
< key = db[i].db.desc.cmd & OHCI_KEY_MASK;
---
> key = db[i].db.desc.control & OHCI_KEY_MASK;
2219,2223c2234,2238
< dbcode[(db[i].db.desc.cmd >> 28) & 0xf],
< dbkey[(db[i].db.desc.cmd >> 24) & 0x7],
< dbcond[(db[i].db.desc.cmd >> 20) & 0x3],
< dbcond[(db[i].db.desc.cmd >> 18) & 0x3],
< db[i].db.desc.cmd & 0xffff,
---
> dbcode[(db[i].db.desc.control >> 12) & 0xf],
> dbkey[(db[i].db.desc.control >> 8) & 0x7],
> dbcond[(db[i].db.desc.control >> 4) & 0x3],
> dbcond[(db[i].db.desc.control >> 2) & 0x3],
> db[i].db.desc.reqcount,
2253c2268
< if((db[i].db.desc.cmd & OHCI_BRANCH_MASK)
---
> if((db[i].db.desc.control & OHCI_BRANCH_MASK)
2257c2272
< if((db[i].db.desc.cmd & OHCI_CMD_MASK)
---
> if((db[i].db.desc.control & OHCI_CMD_MASK)
2261c2276
< if((db[i].db.desc.cmd & OHCI_CMD_MASK)
---
> if((db[i].db.desc.control & OHCI_CMD_MASK)
2299a2315
> volatile struct fwohcidb *db;
2314,2315c2330,2335
< db_tr->db[0].db.desc.cmd
< = OHCI_OUTPUT_MORE | OHCI_KEY_ST2 | 8;
---
> db = db_tr->db;
> #if 0
> db[0].db.desc.control
> = OHCI_OUTPUT_MORE | OHCI_KEY_ST2;
> db[0].db.desc.reqcount = 8;
> #endif
2317,2318c2337
< ohcifp = (volatile struct fwohci_txpkthdr *)
< db_tr->db[1].db.immed;
---
> ohcifp = (volatile struct fwohci_txpkthdr *) db[1].db.immed;
2325,2326c2344,2348
< db_tr->db[2].db.desc.cmd
< = OHCI_OUTPUT_LAST
---
> db[2].db.desc.reqcount = ntohs(fp->mode.stream.len);
> db[2].db.desc.status = 0;
> db[2].db.desc.count = 0;
> #if 0 /* if bulkxfer->npackets changes */
> db[2].db.desc.control = OHCI_OUTPUT_LAST
2328,2332c2350,2352
< | OHCI_BRANCH_ALWAYS
< | ((ntohs(fp->mode.stream.len) ) & 0xffff);
< db_tr->db[2].db.desc.status = 0;
< db_tr->db[2].db.desc.count = 0;
< db_tr->db[0].db.desc.depend
---
> | OHCI_BRANCH_ALWAYS;
> db[0].db.desc.depend =
> = db[dbch->ndesc - 1].db.desc.depend
2334,2335c2354,2357
< db_tr->db[dbch->ndesc - 1].db.desc.depend
< = vtophys(STAILQ_NEXT(db_tr, link)->db) | dbch->ndesc;
---
> #else
> db[0].db.desc.depend |= dbch->ndesc;
> db[dbch->ndesc - 1].db.desc.depend |= dbch->ndesc;
> #endif
2339,2342c2361,2365
< db_tr = (struct fwohcidb_tr *)bulkxfer->end;
< db_tr->db[0].db.desc.depend &= ~0xf;
< db_tr->db[dbch->ndesc - 1].db.desc.depend &= ~0xf;
< db_tr->db[dbch->ndesc - 1].db.desc.cmd |= OHCI_INTERRUPT_ALWAYS;
---
> db = ((struct fwohcidb_tr *)bulkxfer->end)->db;
> db[0].db.desc.depend &= ~0xf;
> db[dbch->ndesc - 1].db.desc.depend &= ~0xf;
> #if 0 /* if bulkxfer->npackets changes */
> db[dbch->ndesc - 1].db.desc.control |= OHCI_INTERRUPT_ALWAYS;
2344,2345c2367,2369
< db_tr->db[0].db.desc.cmd |= OHCI_INTERRUPT_ALWAYS;
<
---
> db[0].db.desc.control |= OHCI_INTERRUPT_ALWAYS;
> #endif
> /*
2348d2371
< /*
2368,2370c2391,2392
< db[0].db.desc.cmd = OHCI_OUTPUT_MORE | OHCI_KEY_ST2 | 8;
<
< db[2].db.desc.depend = 0;
---
> db[0].db.desc.control = OHCI_OUTPUT_MORE | OHCI_KEY_ST2;
> db[0].db.desc.reqcount = 8;
2372,2373c2394,2396
< db[2].db.desc.cmd = OHCI_OUTPUT_MORE;
<
---
> db[2].db.desc.control =
> OHCI_OUTPUT_LAST | OHCI_UPDATE | OHCI_BRANCH_ALWAYS;
> #if 1
2376d2398
<
2378a2401
> #endif
2380d2402
< db[2].db.desc.cmd |= OHCI_OUTPUT_LAST;
2382,2383c2404
< db[2].db.desc.cmd
< |= OHCI_INTERRUPT_ALWAYS;
---
> db[2].db.desc.control |= OHCI_INTERRUPT_ALWAYS;
2384a2406,2407
> } else {
> printf("fwohci_add_tx_buf: who calls me?");
2386d2408
< db[2].db.desc.cmd |= OHCI_BRANCH_ALWAYS;
2424c2446,2447
< db[i].db.desc.cmd = OHCI_INPUT_MORE | dsiz[i];
---
> db[i].db.desc.control = OHCI_INPUT_MORE;
> db[i].db.desc.reqcount = dsiz[i];
2426c2449
< db[i].db.desc.cmd |= OHCI_UPDATE;
---
> db[i].db.desc.control |= OHCI_UPDATE;
2432c2455
< db[db_tr->dbcnt - 1].db.desc.cmd |= OHCI_INPUT_LAST;
---
> db[db_tr->dbcnt - 1].db.desc.control |= OHCI_INPUT_LAST;
2434c2457
< db[db_tr->dbcnt - 1].db.desc.cmd
---
> db[db_tr->dbcnt - 1].db.desc.control
2438c2461
< db[db_tr->dbcnt - 1].db.desc.cmd |= OHCI_BRANCH_ALWAYS;
---
> db[db_tr->dbcnt - 1].db.desc.control |= OHCI_BRANCH_ALWAYS;