Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1605 → Rev 1600

/drivers/usb/uhci/detect.inc
41,9 → 41,6
hc->pciId = PciRead32(bus,devfn, 0);
hc->PciTag = pciTag(bus,(devfn>>3)&0x1F,devfn&0x7);
 
hc->irq_line = PciRead32(bus,devfn, 0x3C) & 0xFF;
dbgprintf("Host IRQ %d\n", hc->irq_line);
 
for (i = 0; i < 6; i++)
{
u32_t base;
/drivers/usb/uhci/hcd.inc
1,12 → 1,9
 
#define UHCI_USBLEGSUP 0x00c0 /* legacy support */
#define UHCI_USBLEGSUP_DEFAULT 0x2000 /* only PIRQ enable set */
#define UHCI_USBCMD 0 /* command register */
#define UHCI_USBINTR 4 /* interrupt register */
#define UHCI_USBLEGSUP_RWC 0x8f00 /* the R/WC bits */
#define UHCI_USBLEGSUP_RO 0x5040 /* R/O and reserved bits */
 
 
#define UHCI_USBCMD 0 /* command register */
#define UHCI_USBINTR 4 /* interrupt register */
#define UHCI_USBCMD_RUN 0x0001 /* RUN/STOP bit */
#define UHCI_USBCMD_HCRESET 0x0002 /* Host Controller reset */
#define UHCI_USBCMD_EGSM 0x0008 /* Global Suspend Mode */
120,38 → 117,12
return 1;
}
 
void hc_interrupt()
{
hc_t *hc;
 
printf("USB interrupt\n");
 
hc = (hc_t*)hc_list.next;
 
while( &hc->list != &hc_list)
{
hc_t *tmp;
u16_t status;
 
tmp = hc;
hc = (hc_t*)hc->list.next;
 
status = in16(tmp->iobase + USBSTS);
if (!(status & ~USBSTS_HCH)) /* shared interrupt, not mine */
continue;
out16(tmp->iobase + USBSTS, status); /* Clear it */
}
 
};
 
 
 
bool init_hc(hc_t *hc)
{
int port;
u32_t ifl;
u16_t dev_status;
td_t *td;
int i;
 
dbgprintf("\n\ninit uhci %x\n\n", hc->pciId);
195,43 → 166,19
hc->frame_dma = GetPgAddr(hc->frame_base);
hc->frame_number = 0;
 
 
for (i = 0; i < UHCI_NUM_SKELQH; i++)
{
qh_t *qh = alloc_qh();
 
qh->qlink = 1;
qh->qelem = 1;
 
hc->qh[i] = qh;
}
for (i = SKEL_ISO + 1; i < SKEL_ASYNC; ++i)
hc->qh[i]->qlink = hc->qh[SKEL_ASYNC]->dma | 2;
hc->qh1 = qh;
 
/*
td = alloc_td();
// dbgprintf("alloc qh %x dma %x\n", qh, qh->dma);
 
td->link = 1;
td->status = (1<<24) | (1<<23) ;
td->token = TOKEN( 0x7FF, DATA0, 0, 0, 0xE1);
td->buffer = 0;
td->bk = NULL;
*/
 
for (i = 0; i < 1024; i++)
{
int qnum;
hc->frame_base[i] = qh->dma | 2;
 
qnum = 8 - (int) __bsf( i | 1024);
 
if (qnum <= 1)
qnum = 9;
 
hc->frame_base[i] = hc->qh[qnum]->dma | 2;
}
 
mb();
 
/* Set the frame length to the default: 1 ms exactly */
out8(hc->iobase + USBSOF, USBSOF_DEFAULT);
 
242,13 → 189,6
out16(hc->iobase + USBFRNUM, 0);
 
out16(hc->iobase + USBSTS, 0x3F);
 
out16(hc->iobase + UHCI_USBINTR, 4);
 
AttachIntHandler(hc->irq_line, hc_interrupt, 0);
 
pciWriteWord(hc->PciTag, UHCI_USBLEGSUP, UHCI_USBLEGSUP_DEFAULT);
 
out16(hc->iobase + USBCMD, USBCMD_RS | USBCMD_CF |
USBCMD_MAXP);
 
407,7 → 347,7
 
if( td_prev )
td_prev->link = td->dma | 4;
td->status = TD_CTRL_ACTIVE | dev->speed;
td->status = 0x00800000 | dev->speed;
td->token = TOKEN(packet_size,enp->toggle,enp->address,
dev->addr,dir);
td->buffer = data_dma;
418,10 → 358,17
data_dma+= packet_size;
size-= packet_size;
enp->toggle ^= DATA1;
};
 
td->status |= TD_CTRL_IOC;
}
rq->td_tail = td;
/*
dbgprintf("create request %x\n"
"head %x\n"
"tail %x\n"
"data %x\n"
"size %x\n",
rq, rq->td_head, rq->td_tail,
rq->data, rq->size);
*/
return rq;
}
 
458,7 → 405,7
 
td = alloc_td();
td_prev->link = td->dma | 4;
td->status = TD_CTRL_ACTIVE | dev->speed;
td->status = 0x00800000 | dev->speed;
td->token = TOKEN(packet_size, toggle, 0,dev->addr, pid);
td->buffer = data_dma;
td->bk = td_prev;
476,18 → 423,16
pid = (pid == DIN) ? DOUT : DIN;
 
td->link = 1;
td->status = TD_CTRL_ACTIVE | TD_CTRL_IOC | dev->speed ;
td->status = 0x00800000 | dev->speed;
td->token = (0x7FF<<21)|DATA1|(dev->addr<<8)|pid;
td->buffer = 0;
td->bk = td_prev;
 
qh = dev->host->qh[SKEL_ASYNC];
qh = dev->host->qh1;
 
qh->qelem = td0->dma;
__asm__ __volatile__ ("":::"memory");
 
mb();
// __asm__ __volatile__ ("":::"memory");
 
count_t timeout = 25;
while(timeout--){
delay(10/10);
/drivers/usb/uhci/hid.inc
112,7 → 112,7
pkt = (struct boot_packet *)rq->data;
SetMouseData(pkt->buttons, pkt->x, -pkt->y, -pkt->z, 0);
};
td->status = TD_CTRL_ACTIVE | TD_CTRL_IOC | dev->speed;
td->status = 0x00800000 | dev->speed;
td->token ^= DATA1;
 
return true;
145,7 → 145,6
packet = kzalloc(enp.size, 0);
 
rq = create_request(dev, &enp, DIN, packet, enp.size);
rq->qnum = 6;
rq->handler = &mouse_handler;
 
list_add_tail(&rq->list, &rq_list);
/drivers/usb/uhci/usb.c
113,12 → 113,11
 
td = rq->td_head;
dev = rq->dev;
qh = dev->host->qh1;
 
qh = dev->host->qh[rq->qnum];
qh->qelem = td->dma;
 
mb();
 
__asm__ __volatile__ ("":::"memory");
rq = (request_t*)rq->list.next;
};
 
/drivers/usb/uhci/usb.h
38,23 → 38,6
 
}qh_t __attribute__((aligned(16)));
 
 
#define UHCI_NUM_SKELQH 11
 
#define SKEL_ISO 1
#define SKEL_ASYNC 9
 
/*
#define QH_1 0
#define QH_2 1
#define QH_4 2
#define QH_8 3
#define QH_16 4
#define QH_32 5
#define QH_64 6
*/
 
 
typedef struct
{
list_t list;
65,7 → 48,7
count_t frame_number;
addr_t frame_dma;
 
qh_t *qh[UHCI_NUM_SKELQH];
qh_t *qh1;
 
u32_t *data;
addr_t data_dma;
80,7 → 63,6
addr_t memBase[6];
size_t memSize[6];
u32_t memType[6];
u32_t irq_line;
}hc_t;
 
typedef struct tag_td
232,7 → 214,6
size_t size;
udev_t *dev;
u32_t type;
int qnum;
bool (*handler)(udev_t *dev, struct tag_request *rq);
}request_t;
 
267,13 → 248,3
#define DATA0 (0<<19)
#define DATA1 (1<<19)
 
 
 
static inline u32_t __bsf(u32_t val)
{
asm("bsf %1,%0"
:"=r" (val)
:"rm" (val));
return val;
}