View | Details | Raw Unified | Return to bug 20783
Collapse All | Expand All

(-)i4b/layer1/i4b_avm_fritz_pci.c (-4 / +4 lines)
Lines 39-45 Link Here
39
 *
39
 *
40
 *	$Id: i4b_avm_fritz_pci.c,v 1.3 1999/12/13 21:25:26 hm Exp $
40
 *	$Id: i4b_avm_fritz_pci.c,v 1.3 1999/12/13 21:25:26 hm Exp $
41
 *
41
 *
42
 * $FreeBSD: src/sys/i4b/layer1/i4b_avm_fritz_pci.c,v 1.6.2.1 2000/08/02 23:52:55 peter Exp $
42
 * $FreeBSD: src/sys/i4b/layer1/i4b_avm_fritz_pci.c,v 1.6 1999/12/14 20:48:18 hm Exp $
43
 *
43
 *
44
 *      last edit-date: [Mon Dec 13 21:59:04 1999]
44
 *      last edit-date: [Mon Dec 13 21:59:04 1999]
45
 *
45
 *
Lines 504-510 Link Here
504
504
505
	asc->avma1pp_unit = unit;
505
	asc->avma1pp_unit = unit;
506
506
507
	rid = PCIR_MAPS+4;
507
	rid = PCI_MAP_REG_START+4;
508
	asc->avma1pp_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
508
	asc->avma1pp_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
509
		0, ~0, 1, RF_ACTIVE);
509
		0, ~0, 1, RF_ACTIVE);
510
510
Lines 523-529 Link Here
523
	    RF_SHAREABLE | RF_ACTIVE);
523
	    RF_SHAREABLE | RF_ACTIVE);
524
524
525
	if (asc->avma1pp_irq == NULL) {
525
	if (asc->avma1pp_irq == NULL) {
526
		bus_release_resource(dev, SYS_RES_IOPORT, PCIR_MAPS+4, asc->avma1pp_res);
526
		bus_release_resource(dev, SYS_RES_IOPORT, PCI_MAP_REG_START+4, asc->avma1pp_res);
527
		printf("avma1pp%d: couldn't map interrupt\n", unit);
527
		printf("avma1pp%d: couldn't map interrupt\n", unit);
528
		error = ENXIO;
528
		error = ENXIO;
529
		goto fail;
529
		goto fail;
Lines 533-539 Link Here
533
533
534
	if (error) {
534
	if (error) {
535
		bus_release_resource(dev, SYS_RES_IRQ, 0, asc->avma1pp_res);
535
		bus_release_resource(dev, SYS_RES_IRQ, 0, asc->avma1pp_res);
536
		bus_release_resource(dev, SYS_RES_IOPORT, PCIR_MAPS+4, asc->avma1pp_res);
536
		bus_release_resource(dev, SYS_RES_IOPORT, PCI_MAP_REG_START+4, asc->avma1pp_res);
537
		printf("avma1pp%d: couldn't set up irq\n", unit);
537
		printf("avma1pp%d: couldn't set up irq\n", unit);
538
		goto fail;
538
		goto fail;
539
	}
539
	}
(-)i4b/layer1/i4b_elsa_qs1p.c (-3 / +3 lines)
Lines 29-35 Link Here
29
 *
29
 *
30
 *	$Id: i4b_elsa_qs1p.c,v 1.2 1999/12/13 21:25:26 hm Exp $
30
 *	$Id: i4b_elsa_qs1p.c,v 1.2 1999/12/13 21:25:26 hm Exp $
31
 *
31
 *
32
 * $FreeBSD: src/sys/i4b/layer1/i4b_elsa_qs1p.c,v 1.6.2.1 2000/08/02 23:52:55 peter Exp $
32
 * $FreeBSD: src/sys/i4b/layer1/i4b_elsa_qs1p.c,v 1.6 1999/12/14 20:48:19 hm Exp $
33
 *
33
 *
34
 *      last edit-date: [Mon Dec 13 21:59:51 1999]
34
 *      last edit-date: [Mon Dec 13 21:59:51 1999]
35
 *
35
 *
Lines 77-84 Link Here
77
#define PORT0_MAPOFF	4
77
#define PORT0_MAPOFF	4
78
#define PORT1_MAPOFF	12
78
#define PORT1_MAPOFF	12
79
79
80
#define ELSA_PORT0_MAPOFF	(PCIR_MAPS+PORT0_MAPOFF)
80
#define ELSA_PORT0_MAPOFF	(PCI_MAP_REG_START+PORT0_MAPOFF)
81
#define ELSA_PORT1_MAPOFF	(PCIR_MAPS+PORT1_MAPOFF)
81
#define ELSA_PORT1_MAPOFF	(PCI_MAP_REG_START+PORT1_MAPOFF)
82
82
83
#define PCI_QS1000_DID	0x1000
83
#define PCI_QS1000_DID	0x1000
84
#define PCI_QS1000_VID	0x1048
84
#define PCI_QS1000_VID	0x1048
(-)i4b/layer1/i4b_ipac.h (-1 / +2 lines)
Lines 1-5 Link Here
1
/*
1
/*
2
 * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
2
 * Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
3
 *
3
 *
4
 * Redistribution and use in source and binary forms, with or without
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
5
 * modification, are permitted provided that the following conditions
Lines 49-54 Link Here
49
/* chip version */
49
/* chip version */
50
50
51
#define	IPAC_V11	0x01	/* IPAC Version 1.1 */
51
#define	IPAC_V11	0x01	/* IPAC Version 1.1 */
52
#define IPAC_V12	0x02	/* IPAC Version 1.2 */
52
53
53
/*
54
/*
54
 * definitions of registers and bits for the IPAC ISDN chip.
55
 * definitions of registers and bits for the IPAC ISDN chip.
(-)i4b/layer1/i4b_isic.c (-4 / +5 lines)
Lines 306-321 Link Here
306
306
307
	if(sc->sc_ipac)
307
	if(sc->sc_ipac)
308
	{
308
	{
309
		ret = IPAC_READ(IPAC_ID);
309
		sc->sc_ipac_version = IPAC_READ(IPAC_ID);
310
	
310
	
311
		switch(ret)
311
		switch(sc->sc_ipac_version)
312
		{
312
		{
313
			case 0x01: 
313
			case IPAC_V11:
314
			case IPAC_V12: 
314
				break;
315
				break;
315
	
316
	
316
			default:
317
			default:
317
				printf("isic%d: Error, IPAC version %d unknown!\n",
318
				printf("isic%d: Error, IPAC version %d unknown!\n",
318
					unit, ret);
319
					unit, sc->sc_ipac_version);
319
				return ENXIO;
320
				return ENXIO;
320
				break;
321
				break;
321
322
(-)i4b/layer1/i4b_l1.h (-2 / +3 lines)
Lines 1-5 Link Here
1
/*
1
/*
2
 * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
2
 * Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
3
 *
3
 *
4
 * Redistribution and use in source and binary forms, with or without
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
5
 * modification, are permitted provided that the following conditions
Lines 204-210 Link Here
204
	
204
	
205
	int		sc_isac_version;	/* version number of ISAC */
205
	int		sc_isac_version;	/* version number of ISAC */
206
	int		sc_hscx_version;	/* version number of HSCX */
206
	int		sc_hscx_version;	/* version number of HSCX */
207
207
	int		sc_ipac_version;	/* version number of IPAC */
208
	
208
	int		sc_I430state;	/* I.430 state F3 .... F8 */
209
	int		sc_I430state;	/* I.430 state F3 .... F8 */
209
210
210
	int		sc_I430T3;	/* I.430 Timer T3 running */	
211
	int		sc_I430T3;	/* I.430 Timer T3 running */	
(-)i4b/layer1/pci_isic.c (-4 / +7 lines)
Lines 220-231 Link Here
220
	
220
	
221
	if(sc->sc_ipac)
221
	if(sc->sc_ipac)
222
	{
222
	{
223
		u_int ret = IPAC_READ(IPAC_ID);
223
		sc->sc_ipac_version = IPAC_READ(IPAC_ID);
224
224
225
		switch(ret)
225
		switch(sc->sc_ipac_version)
226
		{
226
		{
227
			case 0x01:
227
			case IPAC_V11:
228
				printf("%s: IPAC PSB2115 Version 1.1\n", sc->sc_dev.dv_xname);
228
			case IPAC_V12:
229
				printf("%s: IPAC PSB2115 Version 1.%d\n",
230
					sc->sc_dev.dv_xname,
231
					sc->sc_ipac_versio);
229
				break;
232
				break;
230
	
233
	
231
			default:
234
			default:

Return to bug 20783