Date: Sun, 13 Jan 2008 15:11:35 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 133194 for review Message-ID: <200801131511.m0DFBZVK026566@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=133194 Change 133194 by hselasky@hselasky_laptop001 on 2008/01/13 15:11:19 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#71 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#71 (text+ko) ==== @@ -2524,15 +2524,19 @@ sa = usbd_fs_isoc_schedule_alloc(fss, *plen); if (*plen) { - /* only call "usbd_get_page()" when we have a non-zero length */ - usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); - td->sitd_bp[0] = htole32(buf_res.physaddr); - buf_offset += *plen; - /* NOTE: We need to subtract one from the - * offset so that we are on a valid page! + /* + * only call "usbd_get_page()" when we have a + * non-zero length + */ + usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); + td->sitd_bp[0] = htole32(buf_res.physaddr); + buf_offset += *plen; + /* + * NOTE: We need to subtract one from the offset so + * that we are on a valid page! */ - usbd_get_page(xfer->frbuffers + 0, buf_offset-1, &buf_res); - temp = buf_res.physaddr & ~0xFFF; + usbd_get_page(xfer->frbuffers + 0, buf_offset - 1, &buf_res); + temp = buf_res.physaddr & ~0xFFF; } else { td->sitd_bp[0] = 0; temp = 0; @@ -2703,7 +2707,7 @@ uint32_t buf_offset; uint32_t nframes; uint32_t *plen; - uint32_t itd_offset[8+1]; + uint32_t itd_offset[8 + 1]; uint8_t x; uint8_t td_no; uint8_t page_no; @@ -2798,10 +2802,9 @@ #endif *plen = xfer->max_frame_size; } - status = (EHCI_ITD_SET_LEN(*plen) | - EHCI_ITD_ACTIVE | - EHCI_ITD_SET_PG(0)); + EHCI_ITD_ACTIVE | + EHCI_ITD_SET_PG(0)); td->itd_status[td_no] = htole32(status); itd_offset[td_no] = buf_offset; buf_offset += *plen; @@ -2810,58 +2813,57 @@ if ((td_no == 8) || (nframes == 0)) { - /* the rest of the transfers are not active, if any */ - for (x = td_no; x != 8; x++) { - td->itd_status[x] = 0; /* not active */ - } + /* the rest of the transfers are not active, if any */ + for (x = td_no; x != 8; x++) { + td->itd_status[x] = 0; /* not active */ + } - /* check if there is any data to be transferred */ - if (itd_offset[0] != buf_offset) { - page_no = 0; - itd_offset[td_no] = buf_offset; + /* check if there is any data to be transferred */ + if (itd_offset[0] != buf_offset) { + page_no = 0; + itd_offset[td_no] = buf_offset; - /* get first page offset */ - usbd_get_page(xfer->frbuffers + 0, itd_offset[0], &buf_res); - /* get page address */ - page_addr = buf_res.physaddr & ~0xFFF; + /* get first page offset */ + usbd_get_page(xfer->frbuffers + 0, itd_offset[0], &buf_res); + /* get page address */ + page_addr = buf_res.physaddr & ~0xFFF; - for (x = 0; x != td_no; x++) { - /* set page number and page offset */ - status = (EHCI_ITD_SET_PG(page_no) | - (buf_res.physaddr & 0xFFF)); - td->itd_status[x] |= htole32(status); + for (x = 0; x != td_no; x++) { + /* set page number and page offset */ + status = (EHCI_ITD_SET_PG(page_no) | + (buf_res.physaddr & 0xFFF)); + td->itd_status[x] |= htole32(status); - /* get next page offset */ - if (itd_offset[x+1] == buf_offset) { - /* - * We subtract one so that we don't go - * off the last page! - */ - usbd_get_page(xfer->frbuffers + 0, buf_offset-1, &buf_res); - } else { - usbd_get_page(xfer->frbuffers + 0, itd_offset[x+1], &buf_res); - } + /* get next page offset */ + if (itd_offset[x + 1] == buf_offset) { + /* + * We subtract one so that + * we don't go off the last + * page! + */ + usbd_get_page(xfer->frbuffers + 0, buf_offset - 1, &buf_res); + } else { + usbd_get_page(xfer->frbuffers + 0, itd_offset[x + 1], &buf_res); + } - /* check if we need a new page */ - if ((buf_res.physaddr ^ page_addr) & ~0xFFF) { - /* new page needed */ - page_addr = buf_res.physaddr & ~0xFFF; - if (page_no == 6) { - panic("%s: too many pages\n", __FUNCTION__); + /* check if we need a new page */ + if ((buf_res.physaddr ^ page_addr) & ~0xFFF) { + /* new page needed */ + page_addr = buf_res.physaddr & ~0xFFF; + if (page_no == 6) { + panic("%s: too many pages\n", __FUNCTION__); + } + page_no++; + /* update page address */ + td->itd_bp[page_no] &= htole32(0xFFF); + td->itd_bp[page_no] |= htole32(page_addr); + } } - page_no++; - /* update page address */ - td->itd_bp[page_no] &= htole32(0xFFF); - td->itd_bp[page_no] |= htole32(page_addr); } - } - } - /* set IOC bit if we are complete */ if (nframes == 0) { td->itd_status[7] |= htole32(EHCI_ITD_IOC); } - usbd_pc_cpu_flush(td->page_cache); #ifdef USB_DEBUG if (ehcidebug > 15) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801131511.m0DFBZVK026566>