| maestro.c (119287) | maestro.c (119690) |
|---|---|
| 1/*- 2 * Copyright (c) 2000 Taku YAMAMOTO <taku@cent.saitama-u.ac.jp> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 37 unchanged lines hidden (view full) --- 46 47#include <dev/sound/pcm/sound.h> 48#include <dev/sound/pcm/ac97.h> 49#include <dev/pci/pcireg.h> 50#include <dev/pci/pcivar.h> 51 52#include <dev/sound/pci/maestro_reg.h> 53 | 1/*- 2 * Copyright (c) 2000 Taku YAMAMOTO <taku@cent.saitama-u.ac.jp> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 37 unchanged lines hidden (view full) --- 46 47#include <dev/sound/pcm/sound.h> 48#include <dev/sound/pcm/ac97.h> 49#include <dev/pci/pcireg.h> 50#include <dev/pci/pcivar.h> 51 52#include <dev/sound/pci/maestro_reg.h> 53 |
| 54SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/maestro.c 119287 2003-08-22 07:08:17Z imp $"); | 54SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/maestro.c 119690 2003-09-02 17:30:40Z jhb $"); |
| 55 56#define inline __inline 57 58/* 59 * PCI IDs of supported chips: 60 * 61 * MAESTRO-1 0x01001285 62 * MAESTRO-2 0x1968125d --- 882 unchanged lines hidden (view full) --- 945} 946 947static int 948agg_attach(device_t dev) 949{ 950 struct agg_info *ess = NULL; 951 u_int32_t data; 952 int mapped = 0; | 55 56#define inline __inline 57 58/* 59 * PCI IDs of supported chips: 60 * 61 * MAESTRO-1 0x01001285 62 * MAESTRO-2 0x1968125d --- 882 unchanged lines hidden (view full) --- 945} 946 947static int 948agg_attach(device_t dev) 949{ 950 struct agg_info *ess = NULL; 951 u_int32_t data; 952 int mapped = 0; |
| 953 int regid = PCIR_MAPS; | 953 int regid = PCIR_BAR(0); |
| 954 struct resource *reg = NULL; 955 struct ac97_info *codec = NULL; 956 int irqid = 0; 957 struct resource *irq = NULL; 958 void *ih = NULL; 959 char status[SND_STATUSLEN]; 960 961 if ((ess = malloc(sizeof *ess, M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { --- 234 unchanged lines hidden --- | 954 struct resource *reg = NULL; 955 struct ac97_info *codec = NULL; 956 int irqid = 0; 957 struct resource *irq = NULL; 958 void *ih = NULL; 959 char status[SND_STATUSLEN]; 960 961 if ((ess = malloc(sizeof *ess, M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { --- 234 unchanged lines hidden --- |