- Separate PMC class dependent code from other kinds of machine

  dependencies.  A 'struct pmc_classdep' structure describes operations
  on PMCs; 'struct pmc_mdep' contains one or more 'struct pmc_classdep'
  structures depending on the CPU in question.

  Inside PMC class dependent code, row indices are relative to the
  PMCs supported by the PMC class; MI code in "hwpmc_mod.c" translates
  global row indices before invoking class dependent operations.

- Augment the OP_GETCPUINFO request with the number of PMCs present
  in a PMC class.

- Move code common to Intel CPUs to file "hwpmc_intel.c".

- Move TSC handling to file "hwpmc_tsc.c".

1 files changed, 3 insertions, 2 deletions

diff --git a/sys/dev/hwpmc/hwpmc_ppro.h b/sys/dev/hwpmc/hwpmc_ppro.h
index f750735..c42a2b4 100644
--- a/sys/dev/hwpmc/hwpmc_ppro.h
+++ b/sys/dev/hwpmc/hwpmc_ppro.h
@@ -33,7 +33,7 @@
 
 /* Intel PPro, Celeron, P-II, P-III, Pentium-M PMCS */
 
-#define	P6_NPMCS	3		/* 1 TSC + 2 PMCs */
+#define	P6_NPMCS	2		/* 2 PMCs */
 
 #define	P6_EVSEL_CMASK_MASK		0xFF000000
 #define	P6_EVSEL_TO_CMASK(C)		(((C) & 0xFF) << 24)
@@ -77,7 +77,8 @@ struct pmc_md_ppro_pmc {
  * Prototypes
  */
 
-int	pmc_initialize_p6(struct pmc_mdep *);		/* Pentium Pro PMCs */
+int	pmc_p6_initialize(struct pmc_mdep *_md, int _ncpus);
+void	pmc_p6_finalize(struct pmc_mdep *_md);
 
 #endif /* _KERNEL */
 #endif /* _DEV_HWPMC_PPRO_H_ */