Fri Dec 30 14:32:31 2011 UTC ()
this should have been committed along with the previous changes in
radeonfb.c


(macallan)
diff -r1.11 -r1.12 src/sys/dev/pci/radeonfbvar.h
cvs diff -r1.11 -r1.12 src/sys/dev/pci/radeonfbvar.h (expand / switch to unified diff)

--- src/sys/dev/pci/radeonfbvar.h 2011/02/06 23:25:17 1.11
+++ src/sys/dev/pci/radeonfbvar.h 2011/12/30 14:32:31 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: radeonfbvar.h,v 1.11 2011/02/06 23:25:17 jmcneill Exp $ */ 1/* $NetBSD: radeonfbvar.h,v 1.12 2011/12/30 14:32:31 macallan Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2006 Itronix Inc. 4 * Copyright (c) 2006 Itronix Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Garrett D'Amore for Itronix Inc. 7 * Written by Garrett D'Amore for Itronix Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -199,27 +199,27 @@ struct radeonfb_display { @@ -199,27 +199,27 @@ struct radeonfb_display {
199#endif 199#endif
200 200
201#ifdef SPLASHSCREEN 201#ifdef SPLASHSCREEN
202 struct splash_info rd_splash; 202 struct splash_info rd_splash;
203#endif 203#endif
204}; 204};
205 205
206struct radeon_tmds_pll { 206struct radeon_tmds_pll {
207 uint32_t rtp_freq; 207 uint32_t rtp_freq;
208 uint32_t rtp_pll; 208 uint32_t rtp_pll;
209}; 209};
210 210
211struct radeonfb_softc { 211struct radeonfb_softc {
212 struct device sc_dev; 212 device_t sc_dev;
213 uint16_t sc_family; 213 uint16_t sc_family;
214 uint16_t sc_flags; 214 uint16_t sc_flags;
215 pcireg_t sc_id; 215 pcireg_t sc_id;
216 216
217 char sc_devinfo[256]; 217 char sc_devinfo[256];
218 218
219 bus_space_tag_t sc_regt; 219 bus_space_tag_t sc_regt;
220 bus_space_handle_t sc_regh; 220 bus_space_handle_t sc_regh;
221 bus_size_t sc_regsz; 221 bus_size_t sc_regsz;
222 bus_addr_t sc_regaddr; 222 bus_addr_t sc_regaddr;
223 223
224 bus_space_tag_t sc_memt; 224 bus_space_tag_t sc_memt;
225 bus_space_handle_t sc_memh; 225 bus_space_handle_t sc_memh;
@@ -333,27 +333,27 @@ struct radeonfb_softc { @@ -333,27 +333,27 @@ struct radeonfb_softc {
333#define GETROM8(sc, r) bus_space_read_1(sc->sc_romt, sc->sc_romh, r) 333#define GETROM8(sc, r) bus_space_read_1(sc->sc_romt, sc->sc_romh, r)
334 334
335/* 335/*
336 * Some values in BIOS are misaligned... 336 * Some values in BIOS are misaligned...
337 */ 337 */
338#define GETBIOS8(sc, r) ((sc)->sc_bios[(r)]) 338#define GETBIOS8(sc, r) ((sc)->sc_bios[(r)])
339 339
340#define GETBIOS16(sc, r) \ 340#define GETBIOS16(sc, r) \
341 ((GETBIOS8(sc, (r) + 1) << 8) | GETBIOS8(sc, (r))) 341 ((GETBIOS8(sc, (r) + 1) << 8) | GETBIOS8(sc, (r)))
342 342
343#define GETBIOS32(sc, r) \ 343#define GETBIOS32(sc, r) \
344 ((GETBIOS16(sc, (r) + 2) << 16) | GETBIOS16(sc, (r))) 344 ((GETBIOS16(sc, (r) + 2) << 16) | GETBIOS16(sc, (r)))
345 345
346#define XNAME(sc) device_xname(&sc->sc_dev) 346#define XNAME(sc) device_xname(sc->sc_dev)
347 347
348#define DIVIDE(x,y) (((x) + (y / 2)) / (y)) 348#define DIVIDE(x,y) (((x) + (y / 2)) / (y))
349 349
350uint32_t radeonfb_get32(struct radeonfb_softc *, uint32_t); 350uint32_t radeonfb_get32(struct radeonfb_softc *, uint32_t);
351void radeonfb_put32(struct radeonfb_softc *, uint32_t, uint32_t); 351void radeonfb_put32(struct radeonfb_softc *, uint32_t, uint32_t);
352void radeonfb_mask32(struct radeonfb_softc *, uint32_t, uint32_t, uint32_t); 352void radeonfb_mask32(struct radeonfb_softc *, uint32_t, uint32_t, uint32_t);
353 353
354uint32_t radeonfb_getindex(struct radeonfb_softc *, uint32_t); 354uint32_t radeonfb_getindex(struct radeonfb_softc *, uint32_t);
355void radeonfb_putindex(struct radeonfb_softc *, uint32_t, uint32_t); 355void radeonfb_putindex(struct radeonfb_softc *, uint32_t, uint32_t);
356void radeonfb_maskindex(struct radeonfb_softc *, uint32_t, uint32_t, uint32_t); 356void radeonfb_maskindex(struct radeonfb_softc *, uint32_t, uint32_t, uint32_t);
357 357
358uint32_t radeonfb_getpll(struct radeonfb_softc *, uint32_t); 358uint32_t radeonfb_getpll(struct radeonfb_softc *, uint32_t);
359void radeonfb_putpll(struct radeonfb_softc *, uint32_t, uint32_t); 359void radeonfb_putpll(struct radeonfb_softc *, uint32_t, uint32_t);