diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-05-27 02:24:14 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-05-27 02:27:23 -0400 |
commit | 92af11cdec410f5de4e8d702d24e1672ce26a1f6 (patch) | |
tree | 329a87ad837ff445a111dc8455d0d1f3425a9ab6 /drivers | |
parent | 0645819196b5029936cf07a8ba27860e0d45c8d9 (diff) |
[PATCH] missing readb/readw in rio
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/rio/riocmd.c | 20 | ||||
-rw-r--r-- | drivers/char/rio/riointr.c | 24 | ||||
-rw-r--r-- | drivers/char/rio/riotable.c | 4 |
3 files changed, 24 insertions, 24 deletions
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c index 1a8d4a7fa448..4df6ab2206a1 100644 --- a/drivers/char/rio/riocmd.c +++ b/drivers/char/rio/riocmd.c | |||
@@ -407,12 +407,12 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc | |||
407 | } else | 407 | } else |
408 | rio_dprintk(RIO_DEBUG_CMD, "CONTROL information: This is the RUP for link ``%c'' of host ``%s''\n", ('A' + Rup - MAX_RUP), HostP->Name); | 408 | rio_dprintk(RIO_DEBUG_CMD, "CONTROL information: This is the RUP for link ``%c'' of host ``%s''\n", ('A' + Rup - MAX_RUP), HostP->Name); |
409 | 409 | ||
410 | rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Destination 0x%x:0x%x\n", PacketP->dest_unit, PacketP->dest_port); | 410 | rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Destination 0x%x:0x%x\n", readb(&PacketP->dest_unit), readb(&PacketP->dest_port)); |
411 | rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Source 0x%x:0x%x\n", PacketP->src_unit, PacketP->src_port); | 411 | rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Source 0x%x:0x%x\n", readb(&PacketP->src_unit), readb(&PacketP->src_port)); |
412 | rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Length 0x%x (%d)\n", PacketP->len, PacketP->len); | 412 | rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Length 0x%x (%d)\n", readb(&PacketP->len), readb(&PacketP->len)); |
413 | rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Control 0x%x (%d)\n", PacketP->control, PacketP->control); | 413 | rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Control 0x%x (%d)\n", readb(&PacketP->control), readb(&PacketP->control)); |
414 | rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Check 0x%x (%d)\n", PacketP->csum, PacketP->csum); | 414 | rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Check 0x%x (%d)\n", readw(&PacketP->csum), readw(&PacketP->csum)); |
415 | rio_dprintk(RIO_DEBUG_CMD, "COMMAND information: Host Port Number 0x%x, " "Command Code 0x%x\n", PktCmdP->PhbNum, PktCmdP->Command); | 415 | rio_dprintk(RIO_DEBUG_CMD, "COMMAND information: Host Port Number 0x%x, " "Command Code 0x%x\n", readb(&PktCmdP->PhbNum), readb(&PktCmdP->Command)); |
416 | return 1; | 416 | return 1; |
417 | } | 417 | } |
418 | PortP = p->RIOPortp[SysPort]; | 418 | PortP = p->RIOPortp[SysPort]; |
@@ -601,7 +601,7 @@ int RIOQueueCmdBlk(struct Host *HostP, uint Rup, struct CmdBlk *CmdBlkP) | |||
601 | /* | 601 | /* |
602 | ** Whammy! blat that pack! | 602 | ** Whammy! blat that pack! |
603 | */ | 603 | */ |
604 | HostP->Copy(&CmdBlkP->Packet, RIO_PTR(HostP->Caddr, UnixRupP->RupP->txpkt), sizeof(struct PKT)); | 604 | HostP->Copy(&CmdBlkP->Packet, RIO_PTR(HostP->Caddr, readw(&UnixRupP->RupP->txpkt)), sizeof(struct PKT)); |
605 | 605 | ||
606 | /* | 606 | /* |
607 | ** place command packet on the pending position. | 607 | ** place command packet on the pending position. |
@@ -694,8 +694,8 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP) | |||
694 | */ | 694 | */ |
695 | rio_spin_unlock_irqrestore(&UnixRupP->RupLock, flags); | 695 | rio_spin_unlock_irqrestore(&UnixRupP->RupLock, flags); |
696 | FreeMe = RIOCommandRup(p, Rup, HostP, PacketP); | 696 | FreeMe = RIOCommandRup(p, Rup, HostP, PacketP); |
697 | if (PacketP->data[5] == MEMDUMP) { | 697 | if (readb(&PacketP->data[5]) == MEMDUMP) { |
698 | rio_dprintk(RIO_DEBUG_CMD, "Memdump from 0x%x complete\n", *(unsigned short *) & (PacketP->data[6])); | 698 | rio_dprintk(RIO_DEBUG_CMD, "Memdump from 0x%x complete\n", readw(&(PacketP->data[6]))); |
699 | rio_memcpy_fromio(p->RIOMemDump, &(PacketP->data[8]), 32); | 699 | rio_memcpy_fromio(p->RIOMemDump, &(PacketP->data[8]), 32); |
700 | } | 700 | } |
701 | rio_spin_lock_irqsave(&UnixRupP->RupLock, flags); | 701 | rio_spin_lock_irqsave(&UnixRupP->RupLock, flags); |
@@ -782,7 +782,7 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP) | |||
782 | /* | 782 | /* |
783 | ** Whammy! blat that pack! | 783 | ** Whammy! blat that pack! |
784 | */ | 784 | */ |
785 | HostP->Copy(&CmdBlkP->Packet, RIO_PTR(HostP->Caddr, UnixRupP->RupP->txpkt), sizeof(struct PKT)); | 785 | HostP->Copy(&CmdBlkP->Packet, RIO_PTR(HostP->Caddr, readw(&UnixRupP->RupP->txpkt)), sizeof(struct PKT)); |
786 | 786 | ||
787 | /* | 787 | /* |
788 | ** remove the command from the rup command queue... | 788 | ** remove the command from the rup command queue... |
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c index c05e84c6b0d3..eec1fea0cb92 100644 --- a/drivers/char/rio/riointr.c +++ b/drivers/char/rio/riointr.c | |||
@@ -585,19 +585,19 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP) | |||
585 | /* | 585 | /* |
586 | ** check that it is not a command! | 586 | ** check that it is not a command! |
587 | */ | 587 | */ |
588 | if (PacketP->len & PKT_CMD_BIT) { | 588 | if (readb(&PacketP->len) & PKT_CMD_BIT) { |
589 | rio_dprintk(RIO_DEBUG_INTR, "RIO: unexpected command packet received on PHB\n"); | 589 | rio_dprintk(RIO_DEBUG_INTR, "RIO: unexpected command packet received on PHB\n"); |
590 | /* rio_dprint(RIO_DEBUG_INTR, (" sysport = %d\n", p->RIOPortp->PortNum)); */ | 590 | /* rio_dprint(RIO_DEBUG_INTR, (" sysport = %d\n", p->RIOPortp->PortNum)); */ |
591 | rio_dprintk(RIO_DEBUG_INTR, " dest_unit = %d\n", PacketP->dest_unit); | 591 | rio_dprintk(RIO_DEBUG_INTR, " dest_unit = %d\n", readb(&PacketP->dest_unit)); |
592 | rio_dprintk(RIO_DEBUG_INTR, " dest_port = %d\n", PacketP->dest_port); | 592 | rio_dprintk(RIO_DEBUG_INTR, " dest_port = %d\n", readb(&PacketP->dest_port)); |
593 | rio_dprintk(RIO_DEBUG_INTR, " src_unit = %d\n", PacketP->src_unit); | 593 | rio_dprintk(RIO_DEBUG_INTR, " src_unit = %d\n", readb(&PacketP->src_unit)); |
594 | rio_dprintk(RIO_DEBUG_INTR, " src_port = %d\n", PacketP->src_port); | 594 | rio_dprintk(RIO_DEBUG_INTR, " src_port = %d\n", readb(&PacketP->src_port)); |
595 | rio_dprintk(RIO_DEBUG_INTR, " len = %d\n", PacketP->len); | 595 | rio_dprintk(RIO_DEBUG_INTR, " len = %d\n", readb(&PacketP->len)); |
596 | rio_dprintk(RIO_DEBUG_INTR, " control = %d\n", PacketP->control); | 596 | rio_dprintk(RIO_DEBUG_INTR, " control = %d\n", readb(&PacketP->control)); |
597 | rio_dprintk(RIO_DEBUG_INTR, " csum = %d\n", PacketP->csum); | 597 | rio_dprintk(RIO_DEBUG_INTR, " csum = %d\n", readw(&PacketP->csum)); |
598 | rio_dprintk(RIO_DEBUG_INTR, " data bytes: "); | 598 | rio_dprintk(RIO_DEBUG_INTR, " data bytes: "); |
599 | for (DataCnt = 0; DataCnt < PKT_MAX_DATA_LEN; DataCnt++) | 599 | for (DataCnt = 0; DataCnt < PKT_MAX_DATA_LEN; DataCnt++) |
600 | rio_dprintk(RIO_DEBUG_INTR, "%d\n", PacketP->data[DataCnt]); | 600 | rio_dprintk(RIO_DEBUG_INTR, "%d\n", readb(&PacketP->data[DataCnt])); |
601 | remove_receive(PortP); | 601 | remove_receive(PortP); |
602 | put_free_end(PortP->HostP, PacketP); | 602 | put_free_end(PortP->HostP, PacketP); |
603 | continue; /* with next packet */ | 603 | continue; /* with next packet */ |
@@ -618,7 +618,7 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP) | |||
618 | ** and available space. | 618 | ** and available space. |
619 | */ | 619 | */ |
620 | 620 | ||
621 | transCount = tty_buffer_request_room(TtyP, PacketP->len & PKT_LEN_MASK); | 621 | transCount = tty_buffer_request_room(TtyP, readb(&PacketP->len) & PKT_LEN_MASK); |
622 | rio_dprintk(RIO_DEBUG_REC, "port %d: Copy %d bytes\n", PortP->PortNum, transCount); | 622 | rio_dprintk(RIO_DEBUG_REC, "port %d: Copy %d bytes\n", PortP->PortNum, transCount); |
623 | /* | 623 | /* |
624 | ** To use the following 'kkprintfs' for debugging - change the '#undef' | 624 | ** To use the following 'kkprintfs' for debugging - change the '#undef' |
@@ -630,12 +630,12 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP) | |||
630 | tty_prepare_flip_string(TtyP, &buf, transCount); | 630 | tty_prepare_flip_string(TtyP, &buf, transCount); |
631 | rio_memcpy_fromio(buf, ptr, transCount); | 631 | rio_memcpy_fromio(buf, ptr, transCount); |
632 | PortP->RxDataStart += transCount; | 632 | PortP->RxDataStart += transCount; |
633 | PacketP->len -= transCount; | 633 | writeb(readb(&PacketP->len)-transCount, &PacketP->len); |
634 | copied += transCount; | 634 | copied += transCount; |
635 | 635 | ||
636 | 636 | ||
637 | 637 | ||
638 | if (PacketP->len == 0) { | 638 | if (readb(&PacketP->len) == 0) { |
639 | /* | 639 | /* |
640 | ** If we have emptied the packet, then we can | 640 | ** If we have emptied the packet, then we can |
641 | ** free it, and reset the start pointer for | 641 | ** free it, and reset the start pointer for |
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c index 364119e975b4..7e988357326e 100644 --- a/drivers/char/rio/riotable.c +++ b/drivers/char/rio/riotable.c | |||
@@ -546,11 +546,11 @@ int RIODeleteRta(struct rio_info *p, struct Map *MapP) | |||
546 | ** accessed from the driver. | 546 | ** accessed from the driver. |
547 | */ | 547 | */ |
548 | Pkt = (struct PKT __iomem *) RIO_PTR(HostP->Caddr, readw(&*TxPktP)); | 548 | Pkt = (struct PKT __iomem *) RIO_PTR(HostP->Caddr, readw(&*TxPktP)); |
549 | rio_dprintk(RIO_DEBUG_TABLE, "Tx packet (%x) destination: Old %x:%x New %x:%x\n", *TxPktP, Pkt->dest_unit, Pkt->dest_port, dest_unit, dest_port); | 549 | rio_dprintk(RIO_DEBUG_TABLE, "Tx packet (%x) destination: Old %x:%x New %x:%x\n", readw(TxPktP), readb(&Pkt->dest_unit), readb(&Pkt->dest_port), dest_unit, dest_port); |
550 | writew(dest_unit, &Pkt->dest_unit); | 550 | writew(dest_unit, &Pkt->dest_unit); |
551 | writew(dest_port, &Pkt->dest_port); | 551 | writew(dest_port, &Pkt->dest_port); |
552 | } | 552 | } |
553 | rio_dprintk(RIO_DEBUG_TABLE, "Port %d phb destination: Old %x:%x New %x:%x\n", port, PortP->PhbP->destination & 0xff, (PortP->PhbP->destination >> 8) & 0xff, dest_unit, dest_port); | 553 | rio_dprintk(RIO_DEBUG_TABLE, "Port %d phb destination: Old %x:%x New %x:%x\n", port, readb(&PortP->PhbP->destination) & 0xff, (readb(&PortP->PhbP->destination) >> 8) & 0xff, dest_unit, dest_port); |
554 | writew(dest_unit + (dest_port << 8), &PortP->PhbP->destination); | 554 | writew(dest_unit + (dest_port << 8), &PortP->PhbP->destination); |
555 | } | 555 | } |
556 | rio_spin_unlock_irqrestore(&PortP->portSem, sem_flags); | 556 | rio_spin_unlock_irqrestore(&PortP->portSem, sem_flags); |