Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5753] trunk
|
From: <fd...@us...> - 2010-05-16 17:00:47
|
Revision: 5753
http://jnode.svn.sourceforge.net/jnode/?rev=5753&view=rev
Author: fduminy
Date: 2010-05-16 17:00:38 +0000 (Sun, 16 May 2010)
Log Message:
-----------
- moved (resource related) classes from org.jnode.system to org.jnode.system.resource
- these classes are in their own plugin (that breaks the plugin dependency cycle org.jnode.vm.core -> org.jnode.runtime.core -> org.jnode.plugin -> org.jnode.vm.core)
Signed-off-by: Fabien DUMINY <fab...@we...>
Modified Paths:
--------------
trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
trunk/core/descriptors/org.jnode.driver.bus.pci.xml
trunk/core/descriptors/org.jnode.driver.bus.usb.uhci.xml
trunk/core/descriptors/org.jnode.driver.chipset.i440BX.xml
trunk/core/descriptors/org.jnode.driver.serial.xml
trunk/core/descriptors/org.jnode.driver.system.cmos.xml
trunk/core/descriptors/org.jnode.driver.system.firmware.bios.xml
trunk/core/descriptors/org.jnode.runtime.core.xml
trunk/core/src/classpath/vm/java/nio/MemoryRawData.java
trunk/core/src/classpath/vm/java/nio/NativeVMDirectByteBuffer.java
trunk/core/src/core/org/jnode/boot/InitJarProcessor.java
trunk/core/src/core/org/jnode/boot/MemoryResourceInputStream.java
trunk/core/src/core/org/jnode/system/package.html
trunk/core/src/core/org/jnode/system/x86/DMA.java
trunk/core/src/core/org/jnode/system/x86/DMAPlugin.java
trunk/core/src/core/org/jnode/system/x86/X86DMAChannel.java
trunk/core/src/core/org/jnode/vm/IOResourceImpl.java
trunk/core/src/core/org/jnode/vm/MemoryResourceImpl.java
trunk/core/src/core/org/jnode/vm/MemoryScannerImpl.java
trunk/core/src/core/org/jnode/vm/MultiMediaMemoryResourceImpl.java
trunk/core/src/core/org/jnode/vm/Region.java
trunk/core/src/core/org/jnode/vm/ResourceManagerImpl.java
trunk/core/src/core/org/jnode/vm/Vm.java
trunk/core/src/core/org/jnode/vm/VmArchitecture.java
trunk/core/src/core/org/jnode/vm/VmMultiMediaSupport.java
trunk/core/src/core/org/jnode/vm/VmSystem.java
trunk/core/src/core/org/jnode/vm/scheduler/IRQManager.java
trunk/core/src/core/org/jnode/vm/scheduler/IRQThread.java
trunk/core/src/core/org/jnode/vm/x86/IOAPIC.java
trunk/core/src/core/org/jnode/vm/x86/LocalAPIC.java
trunk/core/src/core/org/jnode/vm/x86/MPBusEntry.java
trunk/core/src/core/org/jnode/vm/x86/MPConfigTable.java
trunk/core/src/core/org/jnode/vm/x86/MPEntry.java
trunk/core/src/core/org/jnode/vm/x86/MPFloatingPointerStructure.java
trunk/core/src/core/org/jnode/vm/x86/MPIOAPICEntry.java
trunk/core/src/core/org/jnode/vm/x86/MPIOInterruptAssignmentEntry.java
trunk/core/src/core/org/jnode/vm/x86/MPInterruptAssignmentEntry.java
trunk/core/src/core/org/jnode/vm/x86/MPLocalInterruptAssignmentEntry.java
trunk/core/src/core/org/jnode/vm/x86/MPProcessorEntry.java
trunk/core/src/core/org/jnode/vm/x86/PIC8259A.java
trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture.java
trunk/core/src/core/org/jnode/vm/x86/VmX86Processor.java
trunk/core/src/core/org/jnode/vm/x86/VmX86Processor32.java
trunk/core/src/core/org/jnode/vm/x86/VmX86Processor64.java
trunk/core/src/driver/org/jnode/driver/Device.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIDriver.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/AbstractStructure.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/AbstractTreeStructure.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/FrameList.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/QueueHead.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/Schedule.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/TransferDescriptor.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIControlPipe.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCICore.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIDataPipe.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIDriver.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIIO.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIPipe.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIPipeManager.java
trunk/core/src/driver/org/jnode/driver/chipset/i440BX/i82371AB_ACPI_SMBusControler.java
trunk/core/src/driver/org/jnode/driver/serial/SerialPortDriver.java
trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiDriver.java
trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiSystemTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/DifferentiatedSystemDescriptionTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/ExtendedSystemDescriptionTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/FirmwareAcpiControlStructure.java
trunk/core/src/driver/org/jnode/driver/system/acpi/FixedAcpiDescriptionTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/RSDP.java
trunk/core/src/driver/org/jnode/driver/system/acpi/RootSystemDescriptionTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/SystemDescriptionTable.java
trunk/core/src/driver/org/jnode/driver/system/cmos/def/CMOS.java
trunk/core/src/driver/org/jnode/driver/system/cmos/def/CMOSPlugin.java
trunk/core/src/driver/org/jnode/driver/system/firmware/bios/BiosDriver.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreen.java
trunk/core/src/mmtk-vm/org/jnode/vm/memmgr/mmtk/BaseMmtkHeapManager.java
trunk/core/src/test/org/jnode/test/CMOSTest.java
trunk/fs/descriptors/org.jnode.driver.block.floppy.xml
trunk/fs/descriptors/org.jnode.driver.bus.ide.xml
trunk/fs/src/driver/org/jnode/driver/block/floppy/DefaultFDC.java
trunk/fs/src/driver/org/jnode/driver/block/floppy/FDC.java
trunk/fs/src/driver/org/jnode/driver/block/floppy/FloppyControllerDriver.java
trunk/fs/src/driver/org/jnode/driver/block/floppy/FloppyReadSectorCommand.java
trunk/fs/src/driver/org/jnode/driver/block/floppy/FloppyWriteSectorCommand.java
trunk/fs/src/driver/org/jnode/driver/block/floppy/support/DefaultFloppyDeviceFactory.java
trunk/fs/src/driver/org/jnode/driver/block/floppy/support/FloppyDeviceFactory.java
trunk/fs/src/driver/org/jnode/driver/bus/ide/DefaultIDEControllerDriver.java
trunk/fs/src/driver/org/jnode/driver/bus/ide/DefaultIDEDeviceFactory.java
trunk/fs/src/driver/org/jnode/driver/bus/ide/DefaultIDEIO.java
trunk/fs/src/driver/org/jnode/driver/bus/ide/IDEBus.java
trunk/fs/src/driver/org/jnode/driver/bus/ide/IDEDeviceFactory.java
trunk/fs/src/test/org/jnode/test/fs/driver/context/IDEDiskDriverContext.java
trunk/fs/src/test/org/jnode/test/fs/driver/factories/MockFloppyDeviceFactory.java
trunk/fs/src/test/org/jnode/test/support/MockObjectFactory.java
trunk/gui/descriptors/org.jnode.driver.ps2.xml
trunk/gui/descriptors/org.jnode.driver.sound.speaker.pc.xml
trunk/gui/descriptors/org.jnode.driver.video.ati.mach64.xml
trunk/gui/descriptors/org.jnode.driver.video.ati.radeon.xml
trunk/gui/descriptors/org.jnode.driver.video.cirrus.xml
trunk/gui/descriptors/org.jnode.driver.video.vesa.xml
trunk/gui/descriptors/org.jnode.driver.video.vga.xml
trunk/gui/descriptors/org.jnode.driver.video.vmware.xml
trunk/gui/src/awt/org/jnode/awt/image/AbstractMemoryImageConsumer.java
trunk/gui/src/awt/org/jnode/awt/image/ImageConsumerByte.java
trunk/gui/src/awt/org/jnode/awt/image/ImageConsumerInt.java
trunk/gui/src/awt/org/jnode/awt/util/AbstractBitmapGraphics.java
trunk/gui/src/awt/org/jnode/awt/util/BitmapGraphics.java
trunk/gui/src/awt/org/jnode/awt/util/BitmapGraphics16bpp.java
trunk/gui/src/awt/org/jnode/awt/util/BitmapGraphics24bpp.java
trunk/gui/src/awt/org/jnode/awt/util/BitmapGraphics32bpp.java
trunk/gui/src/awt/org/jnode/awt/util/BitmapGraphics8bpp.java
trunk/gui/src/driver/org/jnode/driver/ps2/PS2Bus.java
trunk/gui/src/driver/org/jnode/driver/ps2/PS2KeyboardDriver.java
trunk/gui/src/driver/org/jnode/driver/ps2/PS2PointerDriver.java
trunk/gui/src/driver/org/jnode/driver/sound/speaker/pc/PCSpeakerDriver.java
trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Core.java
trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Driver.java
trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Surface.java
trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64VgaIO.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/FBInfo.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/FPIBlock.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/FPITimingBlock.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/PLLInfo.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonCore.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonDriver.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonHardwareCursor.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonSurface.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonVgaIO.java
trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusCore.java
trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusDriver.java
trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusMMIO.java
trunk/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaCore.java
trunk/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaDriver.java
trunk/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaVgaIO.java
trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACommand.java
trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACore.java
trunk/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java
trunk/gui/src/driver/org/jnode/driver/video/vga/StandardVGA.java
trunk/gui/src/driver/org/jnode/driver/video/vga/StandardVGAIO.java
trunk/gui/src/driver/org/jnode/driver/video/vga/VGADriver.java
trunk/gui/src/driver/org/jnode/driver/video/vga/VGASurface.java
trunk/gui/src/driver/org/jnode/driver/video/vgahw/VgaIO.java
trunk/gui/src/driver/org/jnode/driver/video/vgahw/VgaState.java
trunk/gui/src/driver/org/jnode/driver/video/vmware/VMWareCore.java
trunk/gui/src/driver/org/jnode/driver/video/vmware/VMWareDriver.java
trunk/net/descriptors/org.jnode.driver.net.3c90x.xml
trunk/net/descriptors/org.jnode.driver.net.bcm570x.xml
trunk/net/descriptors/org.jnode.driver.net.eepro100.xml
trunk/net/descriptors/org.jnode.driver.net.lance.xml
trunk/net/descriptors/org.jnode.driver.net.ne2k-pci.xml
trunk/net/descriptors/org.jnode.driver.net.prism2.xml
trunk/net/descriptors/org.jnode.driver.net.rtl8139.xml
trunk/net/descriptors/org.jnode.driver.net.via_rhine.xml
trunk/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xCore.java
trunk/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xDriver.java
trunk/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xRxRing.java
trunk/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xTxBuffer.java
trunk/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xCore.java
trunk/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xDriver.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Driver.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Registers.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100RxFD.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Stats.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java
trunk/net/src/driver/org/jnode/driver/net/ethernet/spi/BasicEthernetDriver.java
trunk/net/src/driver/org/jnode/driver/net/lance/BufferManager.java
trunk/net/src/driver/org/jnode/driver/net/lance/DWordIOAccess.java
trunk/net/src/driver/org/jnode/driver/net/lance/Descriptor.java
trunk/net/src/driver/org/jnode/driver/net/lance/DescriptorRing.java
trunk/net/src/driver/org/jnode/driver/net/lance/IOAccess.java
trunk/net/src/driver/org/jnode/driver/net/lance/InitializationBlock32Bit.java
trunk/net/src/driver/org/jnode/driver/net/lance/LanceCore.java
trunk/net/src/driver/org/jnode/driver/net/lance/LanceDriver.java
trunk/net/src/driver/org/jnode/driver/net/lance/RxDescriptor.java
trunk/net/src/driver/org/jnode/driver/net/lance/RxDescriptorRing.java
trunk/net/src/driver/org/jnode/driver/net/lance/TxDescriptor.java
trunk/net/src/driver/org/jnode/driver/net/lance/TxDescriptorRing.java
trunk/net/src/driver/org/jnode/driver/net/lance/WordIOAccess.java
trunk/net/src/driver/org/jnode/driver/net/ne2000/Ne2000Core.java
trunk/net/src/driver/org/jnode/driver/net/ne2000/Ne2000Driver.java
trunk/net/src/driver/org/jnode/driver/net/ne2000/pci/Ne2000PCI.java
trunk/net/src/driver/org/jnode/driver/net/ne2000/pci/Ne2000PCIDriver.java
trunk/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java
trunk/net/src/driver/org/jnode/driver/net/prism2/Prism2Driver.java
trunk/net/src/driver/org/jnode/driver/net/prism2/Prism2IO.java
trunk/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139Core.java
trunk/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139Driver.java
trunk/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139RxRing.java
trunk/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139TxBuffer.java
trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java
trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineDesc.java
trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineDriver.java
trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRing.java
trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRxRing.java
trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineTxRing.java
trunk/net/src/driver/org/jnode/driver/net/wireless/spi/WirelessEthernetDriver.java
Added Paths:
-----------
trunk/core/descriptors/org.jnode.runtime.core.resource.xml
trunk/core/src/core/org/jnode/system/resource/
trunk/core/src/core/org/jnode/system/resource/DMAException.java
trunk/core/src/core/org/jnode/system/resource/DMAManager.java
trunk/core/src/core/org/jnode/system/resource/DMAResource.java
trunk/core/src/core/org/jnode/system/resource/IOResource.java
trunk/core/src/core/org/jnode/system/resource/IRQHandler.java
trunk/core/src/core/org/jnode/system/resource/IRQResource.java
trunk/core/src/core/org/jnode/system/resource/MemoryResource.java
trunk/core/src/core/org/jnode/system/resource/MemoryScanner.java
trunk/core/src/core/org/jnode/system/resource/MultiMediaMemoryResource.java
trunk/core/src/core/org/jnode/system/resource/Resource.java
trunk/core/src/core/org/jnode/system/resource/ResourceManager.java
trunk/core/src/core/org/jnode/system/resource/ResourceNotFreeException.java
trunk/core/src/core/org/jnode/system/resource/ResourceOwner.java
trunk/core/src/core/org/jnode/system/resource/ResourcePermission.java
trunk/core/src/core/org/jnode/system/resource/SimpleResourceOwner.java
trunk/core/src/core/org/jnode/system/resource/package.html
Removed Paths:
-------------
trunk/core/src/core/org/jnode/system/DMAException.java
trunk/core/src/core/org/jnode/system/DMAManager.java
trunk/core/src/core/org/jnode/system/DMAResource.java
trunk/core/src/core/org/jnode/system/IOResource.java
trunk/core/src/core/org/jnode/system/IRQHandler.java
trunk/core/src/core/org/jnode/system/IRQResource.java
trunk/core/src/core/org/jnode/system/MemoryResource.java
trunk/core/src/core/org/jnode/system/MemoryScanner.java
trunk/core/src/core/org/jnode/system/MultiMediaMemoryResource.java
trunk/core/src/core/org/jnode/system/Resource.java
trunk/core/src/core/org/jnode/system/ResourceManager.java
trunk/core/src/core/org/jnode/system/ResourceNotFreeException.java
trunk/core/src/core/org/jnode/system/ResourceOwner.java
trunk/core/src/core/org/jnode/system/ResourcePermission.java
trunk/core/src/core/org/jnode/system/SimpleResourceOwner.java
Property Changed:
----------------
trunk/gui/descriptors/org.jnode.driver.video.vesa.xml
trunk/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java
Modified: trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -1451,7 +1451,7 @@
addCompileHighOptLevel("org.jnode.plugin.manager");
addCompileHighOptLevel("org.jnode.plugin.model");
addCompileHighOptLevel("org.jnode.security");
- addCompileHighOptLevel("org.jnode.system");
+ addCompileHighOptLevel("org.jnode.system.resource");
addCompileHighOptLevel("org.jnode.system.event");
addCompileHighOptLevel("org.jnode.util");
addCompileHighOptLevel("org.jnode.vm");
Modified: trunk/core/descriptors/org.jnode.driver.bus.pci.xml
===================================================================
--- trunk/core/descriptors/org.jnode.driver.bus.pci.xml 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/descriptors/org.jnode.driver.bus.pci.xml 2010-05-16 17:00:38 UTC (rev 5753)
@@ -23,7 +23,7 @@
</extension>
<extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="ioports"/>
+ <permission class="org.jnode.system.resource.ResourcePermission" name="ioports"/>
<permission class="org.jnode.permission.JNodePermission" name="getVmClass"/>
</extension>
Modified: trunk/core/descriptors/org.jnode.driver.bus.usb.uhci.xml
===================================================================
--- trunk/core/descriptors/org.jnode.driver.bus.usb.uhci.xml 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/descriptors/org.jnode.driver.bus.usb.uhci.xml 2010-05-16 17:00:38 UTC (rev 5753)
@@ -25,7 +25,7 @@
</extension>
<extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="ioports"/>
+ <permission class="org.jnode.system.resource.ResourcePermission" name="ioports"/>
</extension>
</plugin>
Modified: trunk/core/descriptors/org.jnode.driver.chipset.i440BX.xml
===================================================================
--- trunk/core/descriptors/org.jnode.driver.chipset.i440BX.xml 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/descriptors/org.jnode.driver.chipset.i440BX.xml 2010-05-16 17:00:38 UTC (rev 5753)
@@ -23,7 +23,7 @@
</extension>
<extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="ioports"/>
+ <permission class="org.jnode.system.resource.ResourcePermission" name="ioports"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/core/descriptors/org.jnode.driver.serial.xml
===================================================================
--- trunk/core/descriptors/org.jnode.driver.serial.xml 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/descriptors/org.jnode.driver.serial.xml 2010-05-16 17:00:38 UTC (rev 5753)
@@ -22,7 +22,7 @@
</extension>
<extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="ioports"/>
+ <permission class="org.jnode.system.resource.ResourcePermission" name="ioports"/>
</extension>
</plugin>
Modified: trunk/core/descriptors/org.jnode.driver.system.cmos.xml
===================================================================
--- trunk/core/descriptors/org.jnode.driver.system.cmos.xml 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/descriptors/org.jnode.driver.system.cmos.xml 2010-05-16 17:00:38 UTC (rev 5753)
@@ -20,7 +20,7 @@
</runtime>
<extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="ioports"/>
+ <permission class="org.jnode.system.resource.ResourcePermission" name="ioports"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/core/descriptors/org.jnode.driver.system.firmware.bios.xml
===================================================================
--- trunk/core/descriptors/org.jnode.driver.system.firmware.bios.xml 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/descriptors/org.jnode.driver.system.firmware.bios.xml 2010-05-16 17:00:38 UTC (rev 5753)
@@ -22,7 +22,7 @@
</extension>
<extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.ResourcePermission" name="memoryScanner"/>
+ <permission class="org.jnode.system.resource.ResourcePermission" name="memoryScanner"/>
</extension>
</plugin>
\ No newline at end of file
Added: trunk/core/descriptors/org.jnode.runtime.core.resource.xml
===================================================================
--- trunk/core/descriptors/org.jnode.runtime.core.resource.xml (rev 0)
+++ trunk/core/descriptors/org.jnode.runtime.core.resource.xml 2010-05-16 17:00:38 UTC (rev 5753)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plugin SYSTEM "jnode.dtd">
+
+<plugin id="org.jnode.runtime.core.resource"
+ name="JNode core resource interfaces"
+ version="@VERSION@"
+ system="true"
+ license-name="lgpl"
+ provider-name="JNode.org">
+
+ <runtime>
+ <library name="jnode-core.jar">
+ <export name="org.jnode.system.resource.*"/>
+ </library>
+ </runtime>
+
+</plugin>
\ No newline at end of file
Modified: trunk/core/descriptors/org.jnode.runtime.core.xml
===================================================================
--- trunk/core/descriptors/org.jnode.runtime.core.xml 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/descriptors/org.jnode.runtime.core.xml 2010-05-16 17:00:38 UTC (rev 5753)
@@ -24,7 +24,6 @@
<export name="org.jnode.plugin.model.*"/>
<export name="org.jnode.protocol.plugin.*"/>
<export name="org.jnode.protocol.system.*"/>
- <export name="org.jnode.system.*"/>
<export name="org.jnode.system.event.*"/>
</library>
</runtime>
Modified: trunk/core/src/classpath/vm/java/nio/MemoryRawData.java
===================================================================
--- trunk/core/src/classpath/vm/java/nio/MemoryRawData.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/classpath/vm/java/nio/MemoryRawData.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -21,11 +21,12 @@
package java.nio;
import gnu.classpath.Pointer;
-import org.jnode.system.MemoryResource;
-import org.jnode.system.ResourceManager;
-import org.jnode.system.ResourceOwner;
-import org.jnode.system.SimpleResourceOwner;
-import org.jnode.system.ResourceNotFreeException;
+
+import org.jnode.system.resource.MemoryResource;
+import org.jnode.system.resource.ResourceManager;
+import org.jnode.system.resource.ResourceNotFreeException;
+import org.jnode.system.resource.ResourceOwner;
+import org.jnode.system.resource.SimpleResourceOwner;
import org.jnode.naming.InitialNaming;
import org.vmmagic.unboxed.Address;
import javax.naming.NameNotFoundException;
Modified: trunk/core/src/classpath/vm/java/nio/NativeVMDirectByteBuffer.java
===================================================================
--- trunk/core/src/classpath/vm/java/nio/NativeVMDirectByteBuffer.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/classpath/vm/java/nio/NativeVMDirectByteBuffer.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -21,8 +21,9 @@
package java.nio;
import gnu.classpath.Pointer;
-import org.jnode.system.MemoryResource;
-import org.jnode.system.ResourceNotFreeException;
+
+import org.jnode.system.resource.MemoryResource;
+import org.jnode.system.resource.ResourceNotFreeException;
import org.vmmagic.unboxed.Offset;
import org.vmmagic.unboxed.Extent;
Modified: trunk/core/src/core/org/jnode/boot/InitJarProcessor.java
===================================================================
--- trunk/core/src/core/org/jnode/boot/InitJarProcessor.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/core/org/jnode/boot/InitJarProcessor.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -36,7 +36,7 @@
import org.jnode.plugin.PluginException;
import org.jnode.plugin.PluginLoader;
import org.jnode.plugin.PluginRegistry;
-import org.jnode.system.MemoryResource;
+import org.jnode.system.resource.MemoryResource;
import org.jnode.util.JarBuffer;
/**
Modified: trunk/core/src/core/org/jnode/boot/MemoryResourceInputStream.java
===================================================================
--- trunk/core/src/core/org/jnode/boot/MemoryResourceInputStream.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/core/org/jnode/boot/MemoryResourceInputStream.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -23,7 +23,7 @@
import java.io.IOException;
import java.io.InputStream;
-import org.jnode.system.MemoryResource;
+import org.jnode.system.resource.MemoryResource;
import org.jnode.annotation.MagicPermission;
Deleted: trunk/core/src/core/org/jnode/system/DMAException.java
===================================================================
--- trunk/core/src/core/org/jnode/system/DMAException.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/core/org/jnode/system/DMAException.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -1,58 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2003-2010 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.system;
-
-/**
- * Direct Memory Access Exception.
- *
- * @author Ewout Prangsma (ep...@us...)
- */
-public class DMAException extends Exception {
-
- /**
- *
- */
- public DMAException() {
- super();
- }
-
- /**
- * @param message
- * @param cause
- */
- public DMAException(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * @param cause
- */
- public DMAException(Throwable cause) {
- super(cause);
- }
-
- /**
- * @param s
- */
- public DMAException(String s) {
- super(s);
- }
-}
Deleted: trunk/core/src/core/org/jnode/system/DMAManager.java
===================================================================
--- trunk/core/src/core/org/jnode/system/DMAManager.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/core/org/jnode/system/DMAManager.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -1,49 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2003-2010 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.system;
-
-
-/**
- * Interface of Manager or Direct Memory Access resources.
- *
- * @author Ewout Prangsma (ep...@us...)
- */
-public interface DMAManager {
-
- /**
- * Name used to bind this service into the Initial Namespace
- */
- public static final Class<DMAManager> NAME = DMAManager.class; //"system/DMAService";
-
- /**
- * Claim a DMA channel identified by the given number.
- *
- * @param owner
- * @param dmanr
- * @return The claimed resource
- * @throws IllegalArgumentException Invalid dmanr
- * @throws ResourceNotFreeException Requested DMA channel is in use
- */
- public DMAResource claimDMAChannel(ResourceOwner owner, int dmanr)
- throws IllegalArgumentException, ResourceNotFreeException;
-
-
-}
Deleted: trunk/core/src/core/org/jnode/system/DMAResource.java
===================================================================
--- trunk/core/src/core/org/jnode/system/DMAResource.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/core/org/jnode/system/DMAResource.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -1,69 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2003-2010 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.system;
-
-
-/**
- * Direct Memory Access resource.
- *
- * @author Ewout Prangsma (ep...@us...)
- */
-public interface DMAResource extends Resource {
-
- /**
- * I/O to memory
- */
- public static final int MODE_READ = 1;
- /**
- * Memory to I/O
- */
- public static final int MODE_WRITE = 2;
-
- /**
- * Prepare this channel for a data transfer.
- *
- * @param address
- * @param length
- * @param mode
- * @throws IllegalArgumentException
- * @throws DMAException
- */
- public void setup(MemoryResource address, int length, int mode)
- throws IllegalArgumentException, DMAException;
-
- /**
- * Enable the datatransfer of this channel. This may only be called
- * after a succesful call to setup.
- *
- * @throws DMAException
- */
- public void enable()
- throws DMAException;
-
- /**
- * Gets the remaining length for this channel
- *
- * @return The remaining length
- * @throws DMAException
- */
- public int getLength()
- throws DMAException;
-}
Deleted: trunk/core/src/core/org/jnode/system/IOResource.java
===================================================================
--- trunk/core/src/core/org/jnode/system/IOResource.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/core/org/jnode/system/IOResource.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -1,97 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2003-2010 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.system;
-
-import org.jnode.annotation.KernelSpace;
-import org.jnode.annotation.Uninterruptible;
-
-/**
- * I/O port resource.
- *
- * @author Ewout Prangsma (ep...@us...)
- */
-public interface IOResource extends Resource {
-
- /**
- * Returns the length.
- *
- * @return int
- */
- public abstract int getLength();
-
- /**
- * Returns the startPort.
- *
- * @return int
- */
- public abstract int getStartPort();
-
- /**
- * Get the value of a 8-bit I/O port.
- *
- * @param portNr Absolute port number (not relative to startPort)
- * @return The port value
- */
- public abstract int inPortByte(int portNr);
-
-
- /**
- * Get the value of a 16-bit I/O port.
- *
- * @param portNr Absolute port number (not relative to startPort)
- * @return The port value
- */
- public abstract int inPortWord(int portNr);
-
- /**
- * Get the value of a 32-bit I/O port.
- *
- * @param portNr Absolute port number (not relative to startPort)
- * @return The port value
- */
- public abstract int inPortDword(int portNr);
-
- /**
- * Set the value of a 8-bit I/O port.
- *
- * @param portNr Absolute port number (not relative to startPort)
- * @param value
- */
- @KernelSpace
- @Uninterruptible
- public abstract void outPortByte(int portNr, int value);
-
- /**
- * Set the value of a 16-bit I/O port.
- *
- * @param portNr Absolute port number (not relative to startPort)
- * @param value
- */
- public abstract void outPortWord(int portNr, int value);
-
- /**
- * Set the value of a 32-bit I/O port.
- *
- * @param portNr Absolute port number (not relative to startPort)
- * @param value
- */
- public abstract void outPortDword(int portNr, int value);
-}
Deleted: trunk/core/src/core/org/jnode/system/IRQHandler.java
===================================================================
--- trunk/core/src/core/org/jnode/system/IRQHandler.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/core/org/jnode/system/IRQHandler.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -1,41 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2003-2010 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.system;
-
-/**
- * Hardware Interrupt Handler interface.
- * <p/>
- * An interrupt handler is called from the kernel with interrupts disabled. So keep and handling
- * here as short as possible!
- *
- * @author Ewout Prangsma (ep...@us...)
- */
-public interface IRQHandler {
-
- /**
- * Handle a given hardware interrupt. This method is called from the kernel with interrupts
- * disabled. So keep and handling here as short as possible!
- *
- * @param irq
- */
- public void handleInterrupt(int irq);
-
-}
Deleted: trunk/core/src/core/org/jnode/system/IRQResource.java
===================================================================
--- trunk/core/src/core/org/jnode/system/IRQResource.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/core/org/jnode/system/IRQResource.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -1,44 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2003-2010 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.system;
-
-/**
- * Hardware Interrupt resource.
- *
- * @author Ewout Prangsma (ep...@us...)
- */
-public interface IRQResource extends Resource {
-
- /**
- * Gets the IRQ number of this resource
- *
- * @return the IRQ number
- */
- public int getIRQ();
-
- /**
- * Is this a shared interrupt?
- *
- * @return boolean
- */
- public boolean isShared();
-
-}
Deleted: trunk/core/src/core/org/jnode/system/MemoryResource.java
===================================================================
--- trunk/core/src/core/org/jnode/system/MemoryResource.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/core/org/jnode/system/MemoryResource.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -1,686 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2003-2010 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.system;
-
-import java.nio.ByteBuffer;
-
-import org.jnode.annotation.KernelSpace;
-import org.jnode.annotation.Uninterruptible;
-import org.vmmagic.unboxed.Address;
-import org.vmmagic.unboxed.Extent;
-import org.vmmagic.unboxed.Offset;
-
-
-/**
- * Block of memory resource.
- *
- * @author Ewout Prangsma (ep...@us...)
- */
-public interface MemoryResource extends Resource {
-
- /**
- * Create a bytebuffer that has the same content as this resource.
- *
- * @return the byte buffer
- */
- public abstract ByteBuffer asByteBuffer();
-
- /**
- * Gets a 8-bit signed byte at the given memory address
- *
- * @param memPtr
- * @return byte
- */
- public abstract byte getByte(int memPtr);
-
- /**
- * Gets multiple 8-bit signed bytes from the given memory address
- *
- * @param memPtr
- * @param dst
- * @param dstOfs
- * @param length
- */
- public abstract void getBytes(int memPtr, byte[] dst, int dstOfs, int length);
-
- /**
- * Gets a 16-bit signed short at the given memory address
- *
- * @param memPtr
- * @return short
- */
- public abstract short getShort(int memPtr);
-
- /**
- * Gets multiple 16-bit signed bytes from the given memory address
- *
- * @param memPtr
- * @param dst
- * @param dstOfs
- * @param length
- */
- public abstract void getShorts(int memPtr, short[] dst, int dstOfs, int length);
-
- /**
- * Gets a 16-bit unsigned char at the given memory address
- *
- * @param memPtr
- * @return char
- */
- public abstract char getChar(int memPtr);
-
- /**
- * Gets multiple 16-bit unsigned chars from the given memory address
- *
- * @param memPtr
- * @param dst
- * @param dstOfs
- * @param length
- */
- public abstract void getChars(int memPtr, char[] dst, int dstOfs, int length);
-
- /**
- * Gets a 32-bit signed int at the given memory address
- *
- * @param memPtr
- * @return int
- */
- @KernelSpace
- @Uninterruptible
- public abstract int getInt(int memPtr);
-
- /**
- * Gets multiple 32-bit signed ints from the given memory address
- *
- * @param memPtr
- * @param dst
- * @param dstOfs
- * @param length
- */
- public abstract void getInts(int memPtr, int[] dst, int dstOfs, int length);
-
- /**
- * Gets a 64-bit signed long at the given memory address
- *
- * @param memPtr
- * @return long
- */
- public abstract long getLong(int memPtr);
-
- /**
- * Gets multiple 64-bit signed longs from the given memory address
- *
- * @param memPtr
- * @param dst
- * @param dstOfs
- * @param length
- */
- public abstract void getLongs(int memPtr, long[] dst, int dstOfs, int length);
-
- /**
- * Gets a float at the given memory address
- *
- * @param memPtr
- * @return float
- */
- public abstract float getFloat(int memPtr);
-
- /**
- * Gets multiple 32-bit floats from the given memory address
- *
- * @param memPtr
- * @param dst
- * @param dstOfs
- * @param length
- */
- public abstract void getFloats(int memPtr, float[] dst, int dstOfs, int length);
-
- /**
- * Gets a double at the given memory address
- *
- * @param memPtr
- * @return double
- */
- public abstract double getDouble(int memPtr);
-
- /**
- * Gets multiple 64-bit doubles from the given memory address
- *
- * @param memPtr
- * @param dst
- * @param dstOfs
- * @param length
- */
- public abstract void getDoubles(int memPtr, double[] dst, int dstOfs, int length);
-
- /**
- * Gets a object reference at the given memory address
- *
- * @param memPtr
- * @return Object
- */
- public abstract Object getObject(int memPtr);
-
- /**
- * Sets a byte at a given memory address
- *
- * @param memPtr
- * @param value
- */
- public abstract void setByte(int memPtr, byte value);
-
- /**
- * Sets a byte at a given memory address
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void setByte(int memPtr, byte value, int count);
-
- /**
- * Perform a bitwise AND of the byte at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void andByte(int memPtr, byte value, int count);
-
- /**
- * Perform a bitwise OR of the byte at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void orByte(int memPtr, byte value, int count);
-
- /**
- * Perform a bitwise XOR of the byte at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void xorByte(int memPtr, byte value, int count);
-
- /**
- * Sets multiple 8-bit signed bytes at the given memory address
- *
- * @param src
- * @param srcOfs
- * @param dstPtr
- * @param length
- */
- public abstract void setBytes(byte[] src, int srcOfs, int dstPtr, int length);
-
- /**
- * Sets a char at a given memory address
- *
- * @param memPtr
- * @param value
- */
- public abstract void setChar(int memPtr, char value);
-
- /**
- * Sets a char at a given memory address
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void setChar(int memPtr, char value, int count);
-
- /**
- * Perform a bitwise AND of the char at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void andChar(int memPtr, char value, int count);
-
- /**
- * Perform a bitwise OR of the char at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void orChar(int memPtr, char value, int count);
-
- /**
- * Perform a bitwise XOR of the char at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void xorChar(int memPtr, char value, int count);
-
- /**
- * Sets multiple 16-bit unsigned chars at the given memory address
- *
- * @param src
- * @param srcOfs
- * @param dstPtr
- * @param length
- */
- public abstract void setChars(char[] src, int srcOfs, int dstPtr, int length);
-
- /**
- * Sets a short at a given memory address
- *
- * @param memPtr
- * @param value
- */
- public abstract void setShort(int memPtr, short value);
-
- /**
- * Sets a short at a given memory address
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void setShort(int memPtr, short value, int count);
-
- /**
- * Perform a bitwise AND of the short at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void andShort(int memPtr, short value, int count);
-
- /**
- * Perform a bitwise OR of the short at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void orShort(int memPtr, short value, int count);
-
- /**
- * Perform a bitwise XOR of the short at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void xorShort(int memPtr, short value, int count);
-
- /**
- * Sets multiple 16-bit signed shorts at the given memory address
- *
- * @param src
- * @param srcOfs
- * @param dstPtr
- * @param length
- */
- public abstract void setShorts(short[] src, int srcOfs, int dstPtr, int length);
-
- /**
- * Sets an int at a given memory address
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void setInt24(int memPtr, int value, int count);
-
- /**
- * Perform a bitwise AND of the int at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- * @param memPtr
- * @param value
- * @param count
- */
- //public abstract void andInt24(int memPtr, int value, int count);
-
- /**
- * Perform a bitwise OR of the int at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- * @param memPtr
- * @param value
- * @param count
- */
- //public abstract void orInt24(int memPtr, int value, int count);
-
- /**
- * Perform a bitwise XOR of the int at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void xorInt24(int memPtr, int value, int count);
-
- /**
- * Sets an int at a given memory address
- *
- * @param memPtr
- * @param value
- */
- @KernelSpace
- @Uninterruptible
- public abstract void setInt(int memPtr, int value);
-
- /**
- * Sets an int at a given memory address
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void setInt(int memPtr, int value, int count);
-
- /**
- * Perform a bitwise AND of the int at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void andInt(int memPtr, int value, int count);
-
- /**
- * Perform a bitwise OR of the int at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void orInt(int memPtr, int value, int count);
-
- /**
- * Perform a bitwise XOR of the int at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void xorInt(int memPtr, int value, int count);
-
- /**
- * Sets multiple 32-bit signed ints at the given memory address
- *
- * @param src
- * @param srcOfs
- * @param dstPtr
- * @param length
- */
- public abstract void setInts(int[] src, int srcOfs, int dstPtr, int length);
-
- /**
- * Sets a float at a given memory address
- *
- * @param memPtr
- * @param value
- */
- public abstract void setFloat(int memPtr, float value);
-
- /**
- * Sets a float at a given memory address
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void setFloat(int memPtr, float value, int count);
-
- /**
- * Sets multiple 32-bit floats at the given memory address
- *
- * @param src
- * @param srcOfs
- * @param dstPtr
- * @param length
- */
- public abstract void setFloats(float[] src, int srcOfs, int dstPtr, int length);
-
- /**
- * Sets a long at a given memory address
- *
- * @param memPtr
- * @param value
- */
- public abstract void setLong(int memPtr, long value);
-
- /**
- * Sets a long at a given memory address
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void setLong(int memPtr, long value, int count);
-
- /**
- * Perform a bitwise AND of the long at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void andLong(int memPtr, long value, int count);
-
- /**
- * Perform a bitwise OR of the long at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void orLong(int memPtr, long value, int count);
-
- /**
- * Perform a bitwise XOR of the long at the given address and the given value.
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void xorLong(int memPtr, long value, int count);
-
- /**
- * Sets multiple 64-bit signed longs at the given memory address
- *
- * @param src
- * @param srcOfs
- * @param dstPtr
- * @param length
- */
- public abstract void setLongs(long[] src, int srcOfs, int dstPtr, int length);
-
- /**
- * Sets a double at a given memory address
- *
- * @param memPtr
- * @param value
- */
- public abstract void setDouble(int memPtr, double value);
-
- /**
- * Sets a double at a given memory address
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void setDouble(int memPtr, double value, int count);
-
- /**
- * Sets multiple 64-bit doubles at the given memory address
- *
- * @param src
- * @param srcOfs
- * @param dstPtr
- * @param length
- */
- public abstract void setDoubles(double[] src, int srcOfs, int dstPtr, int length);
-
- /**
- * Sets a Object at a given memory address
- *
- * @param memPtr
- * @param value
- */
- public abstract void setObject(int memPtr, Object value);
-
- /**
- * Sets a Object at a given memory address
- * While count is greater then 1, the address is incremented and the process repeats.
- *
- * @param memPtr
- * @param value
- * @param count
- */
- public abstract void setObject(int memPtr, Object value, int count);
-
- /**
- * Fill the memory at the given memory address with size times 0 bytes.
- * <p/>
- * memPtr must be VmObject.SLOT_SIZE aligned
- * <p/>
- * size % VmObject.SLOT_SIZE must be 0
- *
- * @param memPtr
- * @param size
- */
- public abstract void clear(int memPtr, int size);
-
- public abstract void copy(int srcMemPtr, int destMemPtr, int size);
-
- /**
- * Returns the size of this buffer in bytes.
- *
- * @return int
- */
- public abstract Extent getSize();
-
- /**
- * Gets the address of the first byte of this buffer
- *
- * @return The address of the first byte of this buffer
- */
- public abstract Address getAddress();
-
- /**
- * Get a memory resource for a portion of this memory resources.
- * The first area of this memory resource that fits the given size
- * and it not claimed by any child resource is returned.
- * If not large enought area if found, a ResourceNotFreeException is thrown.
- * A child resource is always releases when the parent is released.
- * A child resource can be released without releasing the parent.
- *
- * @param size Length of the returned resource in bytes.
- * @param align Align of this boundary. Align must be a multiple of 2.
- * @return the child memory resource
- */
- public abstract MemoryResource claimChildResource(Extent size, int align)
- throws IndexOutOfBoundsException, ResourceNotFreeException;
-
- /**
- * Get a memory resource for a portion of this memory resources.
- * The first area of this memory resource that fits the given size
- * and it not claimed by any child resource is returned.
- * If not large enought area if found, a ResourceNotFreeException is thrown.
- * A child resource is always releases when the parent is released.
- * A child resource can be released without releasing the parent.
- *
- * @param size Length of the returned resource in bytes.
- * @param align Align of this boundary. Align must be a multiple of 2.
- * @return the child memory resource
- */
- public MemoryResource claimChildResource(int size, int align)
- throws IndexOutOfBoundsException, ResourceNotFreeException;
-
- /**
- * Get a memory resource for a portion of this memory resources.
- * A child resource is always releases when the parent is released.
- * A child resource can be released without releasing the parent.
- *
- * @param offset Offset relative to the start of this resource.
- * @param size Length of the returned resource in bytes.
- * @param allowOverlaps If true, overlapping child resources will be allowed,
- * otherwise overlapping child resources will resulut in a ResourceNotFreeException.
- * @return the child memory resource
- */
- public abstract MemoryResource claimChildResource(Offset offset, Extent size, boolean allowOverlaps)
- throws IndexOutOfBoundsException, ResourceNotFreeException;
-
- /**
- * Get a memory resource for a portion of this memory resources.
- * A child resource is always releases when the parent is released.
- * A child resource can be released without releasing the parent.
- *
- * @param offset Offset relative to the start of this resource.
- * @param size Length of the returned resource in bytes.
- * @param allowOverlaps If true, overlapping child resources will be allowed,
- * otherwise overlapping child resources will resulut in a ResourceNotFreeException.
- * @return the child memory resource
- */
- public abstract MemoryResource claimChildResource(int offset, int size, boolean allowOverlaps)
- throws IndexOutOfBoundsException, ResourceNotFreeException;
-
-
- /**
- * Gets a multi media memory resource wrapping this given memory resource.
- *
- * @return The created instance. This will never be null.
- */
- public abstract MultiMediaMemoryResource asMultiMediaMemoryResource();
-
- /**
- * Gets the offset relative to my parent.
- * If this resource has no parent, the address of this buffer is returned.
- */
- public abstract Offset getOffset();
-}
-
Deleted: trunk/core/src/core/org/jnode/system/MemoryScanner.java
===================================================================
--- trunk/core/src/core/org/jnode/system/MemoryScanner.java 2010-05-16 16:51:58 UTC (rev 5752)
+++ trunk/core/src/core/org/jnode/system/MemoryScanner.java 2010-05-16 17:00:38 UTC (rev 5753)
@@ -1,161 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2003-2010 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ...
[truncated message content] |
