# HG changeset patch # User David du Colombier <0intro@gmail.com> # Date 1331909821 -3600 # Node ID 5ff7711591da17138223c5415c031f7edc2b4cc8 # Parent 330935e08586251c95d94251ef5c4551c88b7c84 nix: sync with plan 9 R=nixiedev CC=nix-dev http://codereview.appspot.com/5843047 Committer: Francisco J Ballesteros diff -r 330935e08586 -r 5ff7711591da sys/src/9/omap/uarti8250.c --- a/sys/src/9/omap/uarti8250.c Fri Mar 16 13:13:39 2012 +0100 +++ b/sys/src/9/omap/uarti8250.c Fri Mar 16 15:57:01 2012 +0100 @@ -129,21 +129,10 @@ extern PhysUart i8250physuart; static Ctlr i8250ctlr[] = { -{ .io = (u32int*)PHYSCONS, /* UART3 in TI terminology */ +{ .io = (u32int*)PHYSCONS, .irq = 74, .tbdf = -1, .poll = 0, }, - -/* these exist, but I don't think they're connected to anything external */ -//{ .io = (u32int*)PHYSUART0, -// .irq = 72, -// .tbdf = -1, -// .poll = 0, }, -// -//{ .io = (u32int*)PHYSUART1, -// .irq = 73, -// .tbdf = -1, -// .poll = 0, }, }; static Uart i8250uart[] = { @@ -153,21 +142,6 @@ .phys = &i8250physuart, .console= 1, .next = nil, }, - -/* these exist, but I don't think they're connected to anything external */ -//{ .regs = &i8250ctlr[0], -// .name = "COM1", -// .freq = 3686000, /* Not used, we use the global i8250freq */ -// .phys = &i8250physuart, -// .special= 0, -// .next = &i8250uart[1], }, -// -//{ .regs = &i8250ctlr[1], -// .name = "COM2", -// .freq = 3686000, /* Not used, we use the global i8250freq */ -// .phys = &i8250physuart, -// .special= 0, -// .next = &i8250uart[2], }, }; #define csr8r(c, r) ((c)->io[r])