Attachment 11274 Details for Bug 22263 – file.diff

[patch] file.diff

file.diff (text/plain), 3.61 KB, created by Jim.Pirzyk on 2000-10-24 02:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim.Pirzyk

Created: 2000-10-24 02:00:01 UTC

Size: 3.61 KB

patch

obsolete

>*** osf1.h.orig	Wed Jan  5 18:37:45 2000
>--- osf1.h	Sat Oct 21 10:39:06 2000
>***************
>*** 45,54 ****
>  #define	OSF1_IOCCMD(x)		((x) & 0xff)
>  
>  /* for get sysinfo */
>! #define OSF_GET_MAX_UPROCS	  2
>! #define	OSF_GET_IEEE_FP_CONTROL  45
>! #define	OSF_GET_PROC_TYPE	 60
>  #define	OSF_GET_HWRPB		101
>  
>  /* for set sysinfo */
>  #define	OSF_SET_IEEE_FP_CONTROL  14
>--- 45,59 ----
>  #define	OSF1_IOCCMD(x)		((x) & 0xff)
>  
>  /* for get sysinfo */
>! #define	OSF_GET_MAX_UPROCS	2
>! #define	OSF_GET_PHYSMEM		19
>! #define	OSF_GET_MAX_CPU		30
>! #define	OSF_GET_IEEE_FP_CONTROL 45
>! #define	OSF_GET_CPUS_IN_BOX	55
>! #define	OSF_GET_CPU_INFO	59
>! #define	OSF_GET_PROC_TYPE	60
>  #define	OSF_GET_HWRPB		101
>+ #define	OSF_GET_PLATFORM_NAME	103
>  
>  /* for set sysinfo */
>  #define	OSF_SET_IEEE_FP_CONTROL  14
>*** osf1_misc.c.orig	Fri Jan 28 22:31:27 2000
>--- osf1_misc.c	Sat Oct 21 11:06:18 2000
>***************
>*** 268,273 ****
>--- 268,278 ----
>  	struct osf1_getsysinfo_args *uap;
>  {
>  	int error, retval;
>+ 	extern char cpu_model[128];
>+ 	extern int ncpus;
>+ 	int unit;
>+ 	long percpu;
>+ 	long proctype;
>  
>  	error = retval = 0;
>  
>***************
>*** 277,292 ****
>  		    sizeof(maxprocperuid));
>  		retval = 1;
>  		break;
>  	case OSF_GET_IEEE_FP_CONTROL:
>  		error = copyout(&p->p_addr->u_pcb.pcb_fp_control,uap->buffer,
>  		    sizeof(p->p_addr->u_pcb.pcb_fp_control));
>  		retval = 1;
>  		break;
>! 	case OSF_GET_PROC_TYPE:	{
>! 		int unit;
>! 		long percpu;
>! 		long proctype;
>  
>  		if(uap->nbytes < sizeof(proctype))
>  			error = EINVAL;
>  		else {
>--- 282,328 ----
>  		    sizeof(maxprocperuid));
>  		retval = 1;
>  		break;
>+ 	case OSF_GET_PHYSMEM:
>+ 		error = copyout(&physmem, uap->buffer,
>+ 		    sizeof(physmem));
>+ 		retval = 1;
>+ 		break;
>+ 	case OSF_GET_MAX_CPU:
>+ 	case OSF_GET_CPUS_IN_BOX:
>+ 		error = copyout(&ncpus, uap->buffer,
>+ 		    sizeof(ncpus));
>+ 		retval = 1;
>+ 		break;
>  	case OSF_GET_IEEE_FP_CONTROL:
>  		error = copyout(&p->p_addr->u_pcb.pcb_fp_control,uap->buffer,
>  		    sizeof(p->p_addr->u_pcb.pcb_fp_control));
>  		retval = 1;
>  		break;
>! 	case OSF_GET_CPU_INFO: {
>! 		struct osf1_cpu_info cpuinfo;
>! 
>! 		cpuinfo.current_cpu = 0;
>! 		cpuinfo.cpus_in_box = ncpus;
>! 
>! 		if(uap->nbytes < sizeof(proctype))
>! 			error = EINVAL;
>! 		else {
>! 			unit = alpha_pal_whami();
>! 			cpuinfo.cpu_type = LOCATE_PCS(hwrpb, unit)->pcs_proc_type;
>! 		}
>  
>+ 		cpuinfo.ncpus = ncpus;
>+ 		cpuinfo.cpus_present = ncpus;
>+ 		cpuinfo.cpus_running = ncpus;
>+ 		cpuinfo.cpu_binding = 1;
>+ 		cpuinfo.cpu_ex_binding = 0;
>+ 		cpuinfo.mhz = hwrpb->rpb_cc_freq / 1000000;
>+ 		error = copyout(&cpuinfo, uap->buffer,
>+ 		    sizeof(cpuinfo));
>+ 		retval = 1;
>+ 	}
>+ 		break;
>+ 	case OSF_GET_PROC_TYPE:	{
>  		if(uap->nbytes < sizeof(proctype))
>  			error = EINVAL;
>  		else {
>***************
>*** 312,317 ****
>--- 348,357 ----
>  			retval = 1;
>  		}
>  	}
>+ 		break;
>+ 	case OSF_GET_PLATFORM_NAME:
>+ 		error = copyout(cpu_model, uap->buffer, sizeof(cpu_model));
>+ 		retval = 1;
>  		break;
>  	default:
>  		printf("osf1_getsysinfo called with unknown op=%ld\n", uap->op);
>*** osf1_proto.h.orig	Tue Dec 14 14:37:08 1999
>--- osf1_proto.h	Sat Oct 21 10:44:53 2000
>***************
>*** 277,282 ****
>--- 277,296 ----
>  	caddr_t	arg;	char arg_[PAD_(caddr_t)];
>  	u_long	flag;	char flag_[PAD_(u_long)];
>  };
>+ 
>+ struct	osf1_cpu_info {
>+ 	int     current_cpu;
>+ 	int     cpus_in_box;
>+ 	int     cpu_type;
>+ 	int     ncpus;
>+ 	u_long cpus_present;
>+ 	u_long cpus_running;
>+ 	u_long cpu_binding;
>+ 	u_long cpu_ex_binding;
>+ 	int  mhz;
>+ 	int  unused[3];     /* future expansion */
>+ };
>+ 
>  struct	osf1_setsysinfo_args {
>  	u_long	op;	char op_[PAD_(u_long)];
>  	caddr_t	buffer;	char buffer_[PAD_(caddr_t)];

Actions: View | Diff

Attachments on bug 22263: 11274