[oprof-cvs] CVS: oprofile/events op_events_desc.c,1.6,1.7

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/events
In directory usw-pr-cvs1:/tmp/cvs-serv29854/events

Modified Files:
	op_events_desc.c 
Log Message:

boring changes
 


Index: op_events_desc.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/events/op_events_desc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- op_events_desc.c	14 Jan 2002 08:38:54 -0000	1.6
+++ op_events_desc.c	10 Feb 2002 20:22:56 -0000	1.7
@@ -26,41 +26,6 @@
 
 #include "../op_user.h"
 
-struct op_cpu_type {
-	const char *cpu_name;
-	op_cpu cpu_type;
-};
-
-/* be careful here, later entries will be override earlier ones */
-static struct op_cpu_type op_cpu_types[] = {
-	{ "Pentium Pro",  CPU_PPRO },
-	{ "Pentium II",  CPU_PII },
-	{ "Pentium III", CPU_PIII },
-	{ "Pentium(R) III", CPU_PIII },
-	{ "Celeron",	 CPU_PII },
-	{ "Coppermine",  CPU_PIII },
-	{ "Athlon",	 CPU_ATHLON },
-	{ "Duron",	 CPU_ATHLON },
-	{ "K7",		 CPU_ATHLON },
-};
-
-#define OP_CPU_TYPES_NR (sizeof(op_cpu_types) / sizeof(op_cpu_types[0]))
-
-
-static op_cpu op_type_from_name(char const * name)
-{
-	uint i;
-	op_cpu cpu_type = CPU_NO_GOOD;
-
-	for (i = 0; i < OP_CPU_TYPES_NR; i++) {
-		if (strstr(name, op_cpu_types[i].cpu_name))
-			cpu_type = op_cpu_types[i].cpu_type;
-	}
-	return cpu_type;
-}
-
-#define MODEL_PREFIX "model name\t: "
-
 /**
  * op_get_cpu_type - get from /proc/cpuinfo the cpu type
  *
@@ -87,8 +52,6 @@
 
 	return cpu_type;
 }
-
-#undef OP_CPU_TYPES_NR
 
 struct op_unit_desc op_unit_descs[] = {
 	{ { NULL, NULL, NULL, NULL, NULL, NULL, NULL, }, },