Changeset 1916d1f in mainline for kernel/arch/mips64/include/cpu.h

Timestamp:

2011-07-12T13:41:26Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

50fc490

Parents:

11809eab (diff), 6817eba (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix changes.

File:

• kernel/arch/mips64/include/cpu.h (moved) (moved from uspace/drv/bus/usb/usbmast/scsi.h ) (2 diffs)

kernel/arch/mips64/include/cpu.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2003-2004 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbmast
+/** @addtogroup mips64
  * @{
  */
 /** @file
- * SCSI related structures.
  */
 
-#ifndef USB_USBMAST_SCSI_H_
-#define USB_USBMAST_SCSI_H_
+#ifndef KERN_mips64_CPU_H_
+#define KERN_mips64_CPU_H_
 
-#include <sys/types.h>
-#include <usb/usb.h>
+#include <typedefs.h>
+#include <arch/asm.h>
 
 typedef struct {
-        uint8_t op_code;
-        uint8_t lun_evpd;
-        uint8_t page_code;
-        uint16_t alloc_length;
-        uint8_t ctrl;
-} __attribute__((packed)) scsi_cmd_inquiry_t;
+        uint32_t imp_num;
+        uint32_t rev_num;
+} cpu_arch_t;
 
 #endif
 
-/**
- * @}
+/** @}
  */